[SCM] gdal branch, 1.7, updated. upstream/1.7.3-16-geeb124c

[Francesco Paolo Lovergine]

The following commit has been merged in the 1.7 branch:
commit 1ac97310c423e35984debad1c26d4586cde974f0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu May 12 11:54:51 2011 +0200

    Fixed #626234

diff --git a/debian/changelog b/debian/changelog
index 1d32447..1dce35e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdal (1.7.3-4) unstable; urgency=low
+
+  * [PATCH] Added epsilon patch to fix syntax oddity in referencing
+    eps_block_header union members.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 12 May 2011 11:49:37 +0200
+
 gdal (1.7.3-3) unstable; urgency=low
 
   * Added libepsilon support. Note that libepsilon is LGPL-3 (too).
diff --git a/debian/patches/epsilon b/debian/patches/epsilon
new file mode 100644
index 0000000..432ae61
--- /dev/null
+++ b/debian/patches/epsilon
@@ -0,0 +1,34 @@
+Index: gdal/frmts/epsilon/epsilondataset.cpp
+===================================================================
+--- gdal.orig/frmts/epsilon/epsilondataset.cpp	2011-05-12 11:50:58.000000000 +0200
++++ gdal/frmts/epsilon/epsilondataset.cpp	2011-05-12 11:53:19.000000000 +0200
+@@ -237,8 +237,8 @@
+         return CE_Failure;
+     }
+     
+-    int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
+-    int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
++    int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.w : hdr.hdr_data.tc.w;
++    int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.h : hdr.hdr_data.tc.h;
+     int i;
+ 
+     if (poGDS->nBands == 1)
+@@ -505,12 +505,12 @@
+             continue;
+         }
+         
+-        int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.W : hdr.tc.W;
+-        int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.H : hdr.tc.H;
+-        int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.x : hdr.tc.x;
+-        int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.y : hdr.tc.y;
+-        int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
+-        int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
++        int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.W : hdr.hdr_data.tc.W;
++        int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.H : hdr.hdr_data.tc.H;
++        int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.x : hdr.hdr_data.tc.x;
++        int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.y : hdr.hdr_data.tc.y;
++        int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.w : hdr.hdr_data.tc.w;
++        int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.h : hdr.hdr_data.tc.h;
+ 
+         //CPLDebug("EPSILON", "W=%d,H=%d,x=%d,y=%d,w=%d,h=%d,offset=" CPL_FRMT_GUIB,
+         //                    W, H, x, y, w, h, nStartBlockFileOff);
diff --git a/debian/patches/series b/debian/patches/series
index 485f840..50efd52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ hdf4
 gdal-grass
 ecw-plugin
 mrsid-plugin
+epsilon

-- 
GDAL/OGR library and tools