The following commit has been merged in the master branch:
commit 6a88cbb5ab6622eecbb84e21a7c280720910fece
Author: David Paleino <da...@debian.org>
Date:   Mon May 30 18:59:45 2011 +0200

    Fix code to use newer libepsilon (Closes: #628275)

diff --git a/debian/changelog b/debian/changelog
index ab8ce17..05db57e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+librasterlite (1.0-3) UNRELEASED; urgency=low
+
+  * Fix code to use newer libepsilon (Closes: #628275)
+
+ -- David Paleino <da...@debian.org>  Mon, 30 May 2011 18:59:01 +0200
+
 librasterlite (1.0-2) unstable; urgency=low
 
   * Build-Depend on libtiff4-dev | libtiff-dev
diff --git a/debian/patches/03-libepsilon_transition.patch 
b/debian/patches/03-libepsilon_transition.patch
new file mode 100644
index 0000000..df92ced
--- /dev/null
+++ b/debian/patches/03-libepsilon_transition.patch
@@ -0,0 +1,94 @@
+From: David Paleino <da...@debian.org>
+Subject: use newer libepsilon
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628275
+Forwarded: no
+
+---
+ lib/rasterlite_wavelet.c |   32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+--- librasterlite.orig/lib/rasterlite_wavelet.c
++++ librasterlite/lib/rasterlite_wavelet.c
+@@ -180,34 +180,34 @@ guess_wavelet_type (decode_ctx * ctx, in
+           }
+ /* Image width */
+         if (W == -1)
+-            W = type == EPS_GRAYSCALE_BLOCK ? hdr.gs.W : hdr.tc.W;
++            W = type == EPS_GRAYSCALE_BLOCK ? hdr.hdr_data.gs.W : 
hdr.hdr_data.tc.W;
+         else
+           {
+-              if (type == EPS_GRAYSCALE_BLOCK ? W != hdr.gs.W : W != hdr.tc.W)
++              if (type == EPS_GRAYSCALE_BLOCK ? W != hdr.hdr_data.gs.W : W != 
hdr.hdr_data.tc.W)
+                   return 0;
+           }
+ /* Image height */
+         if (H == -1)
+-            H = type == EPS_GRAYSCALE_BLOCK ? hdr.gs.H : hdr.tc.H;
++            H = type == EPS_GRAYSCALE_BLOCK ? hdr.hdr_data.gs.H : 
hdr.hdr_data.tc.H;
+         else
+           {
+-              if (type == EPS_GRAYSCALE_BLOCK ? H != hdr.gs.H : H != hdr.tc.H)
++              if (type == EPS_GRAYSCALE_BLOCK ? H != hdr.hdr_data.gs.H : H != 
hdr.hdr_data.tc.H)
+                   return 0;
+           }
+ /* Maximal block width and height */
+         if (type == EPS_GRAYSCALE_BLOCK)
+           {
+-              if (hdr.gs.w > w)
+-                  w = hdr.gs.w;
+-              if (hdr.gs.h > h)
+-                  h = hdr.gs.h;
++              if (hdr.hdr_data.gs.w > w)
++                  w = hdr.hdr_data.gs.w;
++              if (hdr.hdr_data.gs.h > h)
++                  h = hdr.hdr_data.gs.h;
+           }
+         else
+           {
+-              if (hdr.tc.w > w)
+-                  w = hdr.tc.w;
+-              if (hdr.tc.h > h)
+-                  h = hdr.tc.h;
++              if (hdr.hdr_data.tc.w > w)
++                  w = hdr.hdr_data.tc.w;
++              if (hdr.hdr_data.tc.h > h)
++                  h = hdr.hdr_data.tc.h;
+           }
+       }
+ /* Rewind file and free buffer */
+@@ -686,7 +686,7 @@ decode_blocks (decode_ctx * ctx)
+         if (ctx->image_type == IMAGE_WAVELET_BW)
+           {
+               /* Skip over broken blocks */
+-              if ((hdr.gs.W != W) || (hdr.gs.H != H))
++              if ((hdr.hdr_data.gs.W != W) || (hdr.hdr_data.gs.H != H))
+                   continue;
+               /* All function parameters are checked at the moment so 
everything except EPS_OK is a logical error. */
+               rc = eps_decode_grayscale_block (Y, buf, &hdr);
+@@ -697,7 +697,7 @@ decode_blocks (decode_ctx * ctx)
+                     goto error;
+                 }
+               if (!decoder_write_grayscale
+-                  (ctx->img, Y, hdr.gs.x, hdr.gs.y, hdr.gs.w, hdr.gs.h))
++                  (ctx->img, Y, hdr.hdr_data.gs.x, hdr.hdr_data.gs.y, 
hdr.hdr_data.gs.w, hdr.hdr_data.gs.h))
+                 {
+                     error_flag = 1;
+                     fprintf (stderr, "Wavelet-wrapper: cannot write block\n");
+@@ -707,7 +707,7 @@ decode_blocks (decode_ctx * ctx)
+         else
+           {
+               /* Skip over broken blocks */
+-              if ((hdr.tc.W != W) || (hdr.tc.H != H))
++              if ((hdr.hdr_data.tc.W != W) || (hdr.hdr_data.tc.H != H))
+                   continue;
+               /* Decode block */
+               rc = eps_decode_truecolor_block (R, G, B, buf, &hdr);
+@@ -719,7 +719,7 @@ decode_blocks (decode_ctx * ctx)
+                 }
+               /* Write encoded block */
+               if (!decoder_write_rgb
+-                  (ctx->img, R, G, B, hdr.tc.x, hdr.tc.y, hdr.tc.w, hdr.tc.h))
++                  (ctx->img, R, G, B, hdr.hdr_data.tc.x, hdr.hdr_data.tc.y, 
hdr.hdr_data.tc.w, hdr.hdr_data.tc.h))
+                 {
+                     error_flag = 1;
+                     fprintf (stderr, "Wavelet-wrapper: cannot write block\n");
diff --git a/debian/patches/series b/debian/patches/series
index 41640e4..c6d12bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 00-systemwide_libepsilon.patch
 01-fix_build.patch
 02-fix_typos.patch
+03-libepsilon_transition.patch

-- 
library supporting raster data sources for spatialite

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to