1
Index: gdal/frmts/epsilon/epsilondataset.cpp
2
===================================================================
3
--- gdal.orig/frmts/epsilon/epsilondataset.cpp 2011-05-12 11:50:58.000000000 +0200
4
+++ gdal/frmts/epsilon/epsilondataset.cpp 2011-05-12 11:53:19.000000000 +0200
9
- int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
10
- int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
11
+ int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.w : hdr.hdr_data.tc.w;
12
+ int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.h : hdr.hdr_data.tc.h;
15
if (poGDS->nBands == 1)
20
- int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.W : hdr.tc.W;
21
- int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.H : hdr.tc.H;
22
- int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.x : hdr.tc.x;
23
- int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.y : hdr.tc.y;
24
- int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
25
- int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
26
+ int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.W : hdr.hdr_data.tc.W;
27
+ int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.H : hdr.hdr_data.tc.H;
28
+ int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.x : hdr.hdr_data.tc.x;
29
+ int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.y : hdr.hdr_data.tc.y;
30
+ int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.w : hdr.hdr_data.tc.w;
31
+ int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.h : hdr.hdr_data.tc.h;
33
//CPLDebug("EPSILON", "W=%d,H=%d,x=%d,y=%d,w=%d,h=%d,offset=" CPL_FRMT_GUIB,
34
// W, H, x, y, w, h, nStartBlockFileOff);