Program: gdcm
Module: $RCSfile: gdcmJpeg2000.cxx,v $
Language: C++
- Date: $Date: 2005/07/11 14:37:53 $
- Version: $Revision: 1.26 $
+ Date: $Date: 2005/10/24 21:21:09 $
+ Version: $Revision: 1.32 $
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>
+
+extern "C" {
+ #include <openjpeg.h>
+}
namespace gdcm
{
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))
+ {
+ gdcmErrorMacro( "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 nbytes = 0;
+
+ 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)
+ {
+ 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;
+ }
+ }
+ 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;
+ }
+ }
+ 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;
+ }
+ }
+ free(img.comps[compno].data);
+ }
+
+ // Free remaining structures
+ j2k_dec_release();
+ // FIXME
+ delete[] inputdata;
+
+ return true;
+}
+
#if 0
- std::ofstream out("/tmp/jpeg2000.jpc");
+bool gdcm_read_JASPER_file (void* raw, char *inputdata, size_t inputlength)
+{
+#if 0
+ std::cerr << "Inputlenght=" << inputlength << std::endl;
+ std::ofstream out("/tmp/jpeg2000.jpc", std::ios::binary);
out.write((char*)inputdata,inputlength);
out.close();
#endif
}
// Decode the image.
- jas_image_t *jasImage = NULL;
+ jas_image_t *jasImage /* = NULL*/; // Useless assignation
if (!(jasImage = jas_image_decode(jasStream, fmtid, 0)))
{
gdcmErrorMacro("cannot decode image");
return true;
}
+#endif
//-----------------------------------------------------------------------------
} // end namespace gdcm