Program: gdcm
Module: $RCSfile: gdcmJpeg2000.cxx,v $
Language: C++
- Date: $Date: 2005/10/24 15:36:33 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2006/01/27 10:01:34 $
+ Version: $Revision: 1.40 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <fstream>
-//#include <jasper/jasper.h>
+
+#if defined(__BORLANDC__)
+ #include <mem.h> // for memset
+#endif
+
extern "C" {
-#include <openjpeg.h>
+ #include <openjpeg.h>
}
namespace gdcm
* @return 1 on success, 0 on error
*/
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *) {
+ std::cerr << "Error in gdcmopenjpeg" << msg << std::endl;
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *) {
+ std::cerr << "Warning in gdcmopenjpeg" << msg << std::endl;
+}
+/**
+sample debug callback expecting no client object
+*/
+void info_callback(const char *msg, void *) {
+ std::cerr << "Info in gdcmopenjpeg" << msg << std::endl;
+}
+
+#define J2K_CFMT 0
+#define JP2_CFMT 1
+#define JPT_CFMT 2
+#define MJ2_CFMT 3
+#define PXM_DFMT 0
+#define PGX_DFMT 1
+#define BMP_DFMT 2
+#define YUV_DFMT 3
+
+/*
+ * Divide an integer by a power of 2 and round upwards.
+ *
+ * a divided by 2^b
+ */
+inline int int_ceildivpow2(int a, int b) {
+ return (a + (1 << b) - 1) >> b;
+}
+
+/*
+ * The following function was copy paste from j2k_to_image.c with part from convert.c
+ */
bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
{
- j2k_image_t img;
- j2k_cp_t cp;
- //jp2_struct_t *jp2_struct=NULL;
-
- // default blindly copied
- cp.layer=0;
- cp.reduce=0;
- cp.decod_format=-1;
- cp.cod_format=-1;
-
- cp.cod_format=J2K_CFMT;
- cp.decod_format = PGX_DFMT;
- int len = inputlength;
- unsigned char *src = (unsigned char*)inputdata;
-
- if (!j2k_decode(src, len, &img, &cp)) {
- fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
- return false;
- }
+ opj_dparameters_t parameters; /* decompression parameters */
+ opj_event_mgr_t event_mgr; /* event manager */
+ opj_image_t *image = NULL;
+ opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
+ opj_cio_t *cio = NULL;
+ unsigned char *src = (unsigned char*)inputdata;
+ int file_length = inputlength;
+ /* configure the event callbacks (not required) */
+ memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+ event_mgr.error_handler = error_callback;
+ event_mgr.warning_handler = warning_callback;
+ event_mgr.info_handler = info_callback;
- /************** PGX *****************/
- //char *data8 = (char*)raw;
- //uint16_t *data8 = (uint16_t*)raw;
- for (int compno = 0; compno < img.numcomps; compno++) {
- j2k_comp_t *comp = &img.comps[compno];
- int nbytes = 0;
+ /* set decoding parameters to default values */
+ opj_set_default_decoder_parameters(¶meters);
- // w = int_ceildiv(img.x1 - img.x0, comp->dx);
- // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), comp->dx);
- int w = img.comps[compno].w;
- int wr = int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
- std::cerr << "wr=" << wr << std::endl;
+ // default blindly copied
+ parameters.cp_layer=0;
+ parameters.cp_reduce=0;
+// parameters.decod_format=-1;
+// parameters.cod_format=-1;
+
+ /* JPEG-2000 codestream */
+ parameters.decod_format = J2K_CFMT;
+ assert(parameters.decod_format == J2K_CFMT);
+ parameters.cod_format = PGX_DFMT;
+ assert(parameters.cod_format == PGX_DFMT);
+
+ /* get a decoder handle */
+ dinfo = opj_create_decompress(CODEC_J2K);
- // h = int_ceildiv(img.y1 - img.y0, comp->dy);
- // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), comp->dy);
- int h = img.comps[compno].h;
- int hr = int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
- std::cerr << "hr=" << hr << std::endl;
+ /* catch events using our callbacks and give a local context */
+ opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, NULL);
+
+ /* setup the decoder decoding parameters using user parameters */
+ opj_setup_decoder(dinfo, ¶meters);
+
+ /* open a byte stream */
+ cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+ /* decode the stream and fill the image structure */
+ image = opj_decode(dinfo, cio);
+ if(!image) {
+ opj_destroy_decompress(dinfo);
+ opj_cio_close(cio);
+ return 1;
+ }
- //fprintf(fdest, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+',
- // comp->prec, wr, hr);
+ /* close the byte stream */
+ opj_cio_close(cio);
+ /* free the memory containing the code-stream */
+ delete[] src; //FIXME
+ src = NULL;
+
+
+ // Copy buffer
+ for (int compno = 0; compno < image->numcomps; compno++)
+ {
+ opj_image_comp_t *comp = &image->comps[compno];
+
+ int w = image->comps[compno].w;
+ int wr = int_ceildivpow2(image->comps[compno].w, image->comps[compno].factor);
+
+ //int h = image.comps[compno].h;
+ int hr = int_ceildivpow2(image->comps[compno].h, image->comps[compno].factor);
+
if (comp->prec <= 8)
- {
- nbytes = 1;
- uint8_t *data8 = (uint8_t*)raw;
- for (int i = 0; i < wr * hr; i++)
- {
- int v = img.comps[compno].data[i / wr * w + i % wr];
- *data8++ = (uint8_t)v;
- }
- }
+ {
+ uint8_t *data8 = (uint8_t*)raw;
+ for (int i = 0; i < wr * hr; i++)
+ {
+ int v = image->comps[compno].data[i / wr * w + i % wr];
+ *data8++ = (uint8_t)v;
+ }
+ }
else if (comp->prec <= 16)
- {
- nbytes = 2;
- uint16_t *data16 = (uint16_t*)raw;
- for (int i = 0; i < wr * hr; i++)
- {
- int v = img.comps[compno].data[i / wr * w + i % wr];
- *data16++ = (uint16_t)v;
- }
- }
+ {
+ uint16_t *data16 = (uint16_t*)raw;
+ for (int i = 0; i < wr * hr; i++)
+ {
+ int v = image->comps[compno].data[i / wr * w + i % wr];
+ *data16++ = (uint16_t)v;
+ }
+ }
else
- {
- nbytes = 4;
- uint32_t *data32 = (uint32_t*)raw;
- for (int i = 0; i < wr * hr; i++)
- {
- int v = img.comps[compno].data[i / wr * w + i % wr];
- *data32++ = (uint32_t)v;
- }
- }
-// for (int i = 0; i < wr * hr; i++)
-// {
-// //std::cout << "i:" << i << '\n';
-// int v = img.comps[compno].data[i / wr * w + i % wr];
-// //for (int j = nbytes - 1; j >= 0; j--)
-// for (int j = 0; j < nbytes-1 ; j++)
-// {
-// char byte = (char) (v >> (j * 8));
-// //fwrite(&byte, 1, 1, fdest);
-// *data8++ = byte;
-// }
-// //*data8++ = (uint16_t)v;
-// }
- free(img.comps[compno].data);
-// fclose(fdest);
- /************** END PGX *****************/
+ {
+ uint32_t *data32 = (uint32_t*)raw;
+ for (int i = 0; i < wr * hr; i++)
+ {
+ int v = image->comps[compno].data[i / wr * w + i % wr];
+ *data32++ = (uint32_t)v;
+ }
+ }
+ //free(image.comps[compno].data);
}
+
+ /* free remaining structures */
+ if(dinfo) {
+ opj_destroy_decompress(dinfo);
+ }
- // Free remaining structures
- //--------------------------
- delete[] inputdata;
- j2k_dec_release();
+ /* free image data structure */
+ opj_image_destroy(image);
return true;
}
+#if 0
+// For openjpeg 0.97
+bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
+{
+ j2k_image_t img;
+ j2k_cp_t cp;
+
+ // default blindly copied
+ cp.layer=0;
+ cp.reduce=0;
+ cp.decod_format=-1;
+ cp.cod_format=-1;
+
+ cp.cod_format=J2K_CFMT;
+ cp.decod_format = PGX_DFMT;
+ int len = inputlength;
+ unsigned char *src = (unsigned char*)inputdata;
+
+ // Decompression
+ if (!j2k_decode(src, len, &img, &cp))
+ {
+ gdcmStaticErrorMacro( "ERROR -> j2k_to_image: failed to decode image!" );
+ return false;
+ }
+
+ // Copy buffer
+ for (int compno = 0; compno < img.numcomps; compno++)
+ {
+ j2k_comp_t *comp = &img.comps[compno];
+
+ int w = img.comps[compno].w;
+ int wr = int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
+
+ //int h = img.comps[compno].h;
+ int hr = int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
+
+ if (comp->prec <= 8)
+ {
+ uint8_t *data8 = (uint8_t*)raw;
+ for (int i = 0; i < wr * hr; i++)
+ {
+ int v = img.comps[compno].data[i / wr * w + i % wr];
+ *data8++ = (uint8_t)v;
+ }
+ }
+ else if (comp->prec <= 16)
+ {
+ uint16_t *data16 = (uint16_t*)raw;
+ for (int i = 0; i < wr * hr; i++)
+ {
+ int v = img.comps[compno].data[i / wr * w + i % wr];
+ *data16++ = (uint16_t)v;
+ }
+ }
+ else
+ {
+ uint32_t *data32 = (uint32_t*)raw;
+ for (int i = 0; i < wr * hr; i++)
+ {
+ int v = img.comps[compno].data[i / wr * w + i % wr];
+ *data32++ = (uint32_t)v;
+ }
+ }
+ free(img.comps[compno].data);
+ }
+
+ // Free remaining structures
+ j2k_dec_release();
+ // FIXME
+ delete[] inputdata;
+
+ return true;
+}
+#endif
+
#if 0
bool gdcm_read_JASPER_file (void* raw, char *inputdata, size_t inputlength)
{
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff