Changeset 13651

Timestamp:

02/01/08 10:54:37 (6 months ago)

Author:

retsios

Message:

Properly handle the new #define corresponding to the J2K_SUBFILE-capable JPEG2000 drivers. I will not implement the encoding at this time, as currently it is not used in the GDAL-GRIB driver anyway.

Files:

• spike/grib/degrib18/g2clib-1.0.4/enc_jpeg2000.c (modified) (3 diffs)

spike/grib/degrib18/g2clib-1.0.4/enc_jpeg2000.c

@@ -8 +8 @@
-#include <stdio.h>
-#include <stdlib.h>
+
+#ifdef USE_JPEG2000_J2KSUBFILE
+// J2KSUBFILE includes .. TODO!!
+#else
-#include <jasper/jasper.h>
-#define JAS_1_700_2
-
+
-
-int enc_jpeg2000(unsigned char *cin,g2int width,g2int height,g2int nbits,
@@ -72 +76 @@
-*$$$*/
-{
+
+#ifdef USE_JPEG2000_J2KSUBFILE
+     
+    // J2KSUBFILE method ... TODO!!
+    return 0;
+
+#else /* USE_JPEG2000_J2KSUBFILE */
+
+    // JasPer method
+
-    int ier,rwcnt;
-    jas_image_t image;
@@ -177 +191 @@
-    return (rwcnt);
-
+#endif /* USE_JPEG2000_J2KSUBFILE */
+
-}
-