Program: gdcm
Module: $RCSfile: gdcmJpeg2000.cxx,v $
Language: C++
- Date: $Date: 2005/05/22 18:38:52 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2005/07/11 18:10:29 $
+ Version: $Revision: 1.27 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//-----------------------------------------------------------------------------
/**
* \brief routine for JPEG decompression
- * @param fp pointer to an already open file descriptor
- * JPEG2000 encoded image
- * @param image_buffer to receive uncompressed pixels
+ * @param raw raw
+ * @param inputdata inputdata
+ * @param inputlength inputlength
* @return 1 on success, 0 on error
- * @warning : not yet made
*/
-bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* raw, size_t inputlength)
+bool gdcm_read_JPEG2000_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
jas_init(); //important...
- // FIXME this is really ugly but it seems I have to load the complete
- // jpeg2000 stream to use jasper:
- uint8_t *inputdata = new uint8_t[inputlength];
- //fp is already 'seek' to proper pos
- fp->read((char*)inputdata, inputlength);
- jas_stream_t *jasStream = jas_stream_memopen((char *)inputdata, inputlength);
+ jas_stream_t *jasStream =
+ jas_stream_memopen((char *)inputdata, inputlength);
int fmtid;
if ((fmtid = jas_image_getfmt(jasStream)) < 0)
int height = jas_image_cmptheight(jasImage, 0);
int prec = jas_image_cmptprec(jasImage, 0);
int i, j, k;
- char *fmtname = jas_image_fmttostr(fmtid);
- printf("%s %d %d %d %d %ld\n", fmtname, numcmpts, width, height, prec, (long) jas_image_rawsize(jasImage));
- // The following should serioulsy be rewritten I cannot belive we need to
+ // The following should serioulsy be rewritten I cannot believe we need to
// do a per pixel decompression, there should be a way to read a full
// scanline...
if (prec == 8)
for ( i = 0; i < height; i++)
for ( j = 0; j < width; j++)
for ( k= 0; k < numcmpts; k++)
- *data8++ =
- (uint8_t)(jas_image_readcmptsample(jasImage, k, j ,i ));
+ *data8++ = (uint8_t)(jas_image_readcmptsample(jasImage, k, j ,i ));
}
else if (prec <= 16)
{
for ( i = 0; i < height; i++)
for ( j = 0; j < width; j++)
for ( k= 0; k < numcmpts; k++)
- *data16++ =
- (uint16_t)(jas_image_readcmptsample(jasImage, k, j ,i ));
+ *data16++ = (uint16_t)(jas_image_readcmptsample(jasImage, k, j ,i ));
}
else if (prec <= 32)
{
for ( i = 0; i < height; i++)
for ( j = 0; j < width; j++)
for ( k= 0; k < numcmpts; k++)
- *data32++ =
- (uint32_t)(jas_image_readcmptsample(jasImage, k, j ,i ));
+ *data32++ = (uint32_t)(jas_image_readcmptsample(jasImage, k, j ,i ));
}
jas_image_destroy(jasImage);
//FIXME
//delete the jpeg temp buffer
+#if 0
+ std::ofstream rawout("/tmp/jpeg2000.raw");
+ rawout.write((char*)raw,height*width*numcmpts*((prec+4)/8));
+ rawout.close();
+#endif
delete[] inputdata;
return true;