Merge pull request #1518 from dg0yt/static-windows

[openjpeg.git] / src / lib / openjpip / jpipstream_manager.c

diff --git a/src/lib/openjpip/jpipstream_manager.c b/src/lib/openjpip/jpipstream_manager.c
index 3227af755a4292fdb9614c9785dac760c77c32b8..29ddc8b800e451f2698a1a4af107d8d4eec0ab5f 100644 (file)
--- a/src/lib/openjpip/jpipstream_manager.c
+++ b/src/lib/openjpip/jpipstream_manager.c
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2010-2011, Kaori Hagihara
  * All rights reserved.
  *
@@ -38,83 +38,103 @@
 #include "ihdrbox_manager.h"
 #include "j2kheader_manager.h"
 
-Byte_t * update_JPIPstream( Byte_t *newstream, OPJ_SIZE_T newstreamlen, Byte_t *cache_stream, OPJ_SIZE_T *streamlen)
+Byte_t * update_JPIPstream(Byte_t *newstream, OPJ_SIZE_T newstreamlen,
+                           Byte_t *cache_stream, OPJ_SIZE_T *streamlen)
 {
-  Byte_t *stream = (Byte_t *)opj_malloc( (*streamlen)+newstreamlen);
-  if( *streamlen > 0)
-    memcpy( stream, cache_stream, *streamlen);
-  memcpy( stream+(*streamlen), newstream, newstreamlen);
-  *streamlen += newstreamlen;
-
-  if(cache_stream)
-    opj_free( cache_stream);
-  
-  return stream;
+    Byte_t *stream = (Byte_t *)opj_malloc((*streamlen) + newstreamlen);
+    if (*streamlen > 0) {
+        memcpy(stream, cache_stream, *streamlen);
+    }
+    memcpy(stream + (*streamlen), newstream, newstreamlen);
+    *streamlen += newstreamlen;
+
+    if (cache_stream) {
+        opj_free(cache_stream);
+    }
+
+    return stream;
 }
 
-void save_codestream( Byte_t *codestream, OPJ_SIZE_T streamlen, const char *fmt)
+void save_codestream(Byte_t *codestream, OPJ_SIZE_T streamlen, const char *fmt)
 {
-  time_t timer;
-  struct tm *t_st;
-  char filename[20];
-  FILE *fp;
-
-  time(&timer);
-  t_st = localtime( &timer);
-  
-  sprintf( filename, "%4d%02d%02d%02d%02d%02d.%.3s", t_st->tm_year+1900, t_st->tm_mon+1, t_st->tm_mday, t_st->tm_hour, t_st->tm_min, t_st->tm_sec, fmt);
-
-  fp = fopen( filename, "wb");
-  if( fwrite( codestream, streamlen, 1, fp) != 1)
-    fprintf( stderr, "Error: failed to write codestream to file %s\n", filename);
-  fclose( fp);
+    time_t timer;
+    struct tm *t_st;
+    char filename[20];
+    FILE *fp;
+
+    time(&timer);
+    t_st = localtime(&timer);
+
+    sprintf(filename, "%4d%02d%02d%02d%02d%02d.%.3s", t_st->tm_year + 1900,
+            t_st->tm_mon + 1, t_st->tm_mday, t_st->tm_hour, t_st->tm_min, t_st->tm_sec,
+            fmt);
+
+    fp = fopen(filename, "wb");
+    if (fwrite(codestream, streamlen, 1, fp) != 1) {
+        fprintf(stderr, "Error: failed to write codestream to file %s\n", filename);
+    }
+    fclose(fp);
 }
 
 
-Byte_t * jpipstream_to_pnm( Byte_t *jpipstream, msgqueue_param_t *msgqueue, Byte8_t csn, int fw, int fh, ihdrbox_param_t **ihdrbox)
+Byte_t * jpipstream_to_pnm(Byte_t *jpipstream, msgqueue_param_t *msgqueue,
+                           Byte8_t csn, int fw, int fh, ihdrbox_param_t **ihdrbox)
 {
-  Byte_t *pnmstream;
-  Byte_t *j2kstream; /* j2k or jp2 codestream */
-  Byte8_t j2klen;
-  FILE *fp;
-  const char j2kfname[] = "tmp.j2k";
+    Byte_t *pnmstream;
+    Byte_t *j2kstream; /* j2k or jp2 codestream */
+    Byte8_t j2klen;
+    size_t retlen;
+    FILE *fp;
+    const char j2kfname[] = "tmp.j2k";
+
+    fp = fopen(j2kfname, "w+b");
+    if (!fp) {
+        return NULL;
+    }
+    j2kstream = recons_j2k(msgqueue, jpipstream, csn, fw, fh, &j2klen);
+    if (!j2kstream) {
+        fclose(fp);
+        remove(j2kfname);
+        return NULL;
+    }
+
+    retlen = fwrite(j2kstream, 1, j2klen, fp);
+    opj_free(j2kstream);
+    fclose(fp);
+    if (retlen != j2klen) {
+        remove(j2kfname);
+        return NULL;
+    }
+
+    pnmstream = j2k_to_pnm(j2kfname, ihdrbox);
+
+    remove(j2kfname);
+
+    return pnmstream;
+}
 
-  j2kstream = recons_j2k( msgqueue, jpipstream, csn, fw, fh, &j2klen); 
+ihdrbox_param_t * get_SIZ_from_jpipstream(Byte_t *jpipstream,
+        msgqueue_param_t *msgqueue, Byte8_t csn)
+{
+    ihdrbox_param_t *ihdrbox;
+    Byte_t *j2kstream;
+    Byte8_t j2klen;
+    SIZmarker_param_t SIZ;
 
-  fp = fopen( j2kfname, "w+b");
-  fwrite( j2kstream, j2klen, 1, fp);
-  opj_free( j2kstream);
-  fseek( fp, 0, SEEK_SET);
+    j2kstream = recons_j2kmainhead(msgqueue, jpipstream, csn, &j2klen);
+    if (!get_mainheader_from_j2kstream(j2kstream, &SIZ, NULL)) {
+        opj_free(j2kstream);
+        return NULL;
+    }
 
-  pnmstream = j2k_to_pnm( fp, ihdrbox);
+    ihdrbox = (ihdrbox_param_t *)opj_malloc(sizeof(ihdrbox_param_t));
 
-  fclose( fp);
-  remove( j2kfname);
+    ihdrbox->width = SIZ.Xsiz;
+    ihdrbox->height = SIZ.Ysiz;
+    ihdrbox->nc = SIZ.Csiz;
+    ihdrbox->bpc = SIZ.Ssiz[0];
 
-  return pnmstream;
-}
+    opj_free(j2kstream);
 
-ihdrbox_param_t * get_SIZ_from_jpipstream( Byte_t *jpipstream, msgqueue_param_t *msgqueue, Byte8_t csn)
-{
-  ihdrbox_param_t *ihdrbox;
-  Byte_t *j2kstream;
-  Byte8_t j2klen;
-  SIZmarker_param_t SIZ;
-
-  j2kstream = recons_j2kmainhead( msgqueue, jpipstream, csn, &j2klen);
-  if( !get_mainheader_from_j2kstream( j2kstream, &SIZ, NULL)){
-    opj_free( j2kstream);
-    return NULL;
-  }
-
-  ihdrbox = (ihdrbox_param_t *)opj_malloc( sizeof(ihdrbox_param_t));
-
-  ihdrbox->width = SIZ.Xsiz;
-  ihdrbox->height = SIZ.Ysiz;
-  ihdrbox->nc = SIZ.Csiz;
-  ihdrbox->bpc = SIZ.Ssiz[0];
-  
-  opj_free( j2kstream);
-
-  return ihdrbox;
+    return ihdrbox;
 }