Merge pull request #1484 from mayeut/mandatory-inttypes-stdint

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

diff --git a/src/lib/openjpip/codestream_manager.c b/src/lib/openjpip/codestream_manager.c
index 47440a4f53929d74a49f3d573cb1cf24fb1e3b91..56ddd39c9f41c13a4132be1251660030ffb616c8 100644 (file)
--- a/src/lib/openjpip/codestream_manager.c
+++ b/src/lib/openjpip/codestream_manager.c
@@ -29,8 +29,8 @@
  */
 
 #include <stdio.h>
+#include <inttypes.h>
 #include "codestream_manager.h"
-#include "opj_inttypes.h"
 
 #ifdef SERVER
 #include "fcgi_stdio.h"
@@ -41,41 +41,42 @@
 #define logstream stderr
 #endif /*SERVER */
 
-codestream_param_t set_codestream( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length)
+codestream_param_t set_codestream(int fd, OPJ_OFF_T offset, OPJ_SIZE_T length)
 {
-  codestream_param_t cs;
+    codestream_param_t cs;
 
-  cs.fd = fd;
-  cs.offset = offset;
-  cs.length = length;
+    cs.fd = fd;
+    cs.offset = offset;
+    cs.length = length;
 
-  return cs;
+    return cs;
 }
 
-Byte_t * fetch_codestreambytes( codestream_param_t *cs, OPJ_OFF_T offset, OPJ_SIZE_T size)
+Byte_t * fetch_codestreambytes(codestream_param_t *cs, OPJ_OFF_T offset,
+                               OPJ_SIZE_T size)
 {
-  return fetch_bytes( cs->fd, cs->offset+offset, size);
+    return fetch_bytes(cs->fd, cs->offset + offset, size);
 }
 
-Byte_t fetch_codestream1byte( codestream_param_t *cs, OPJ_OFF_T offset)
+Byte_t fetch_codestream1byte(codestream_param_t *cs, OPJ_OFF_T offset)
 {
-  return fetch_1byte( cs->fd, cs->offset+offset);
+    return fetch_1byte(cs->fd, cs->offset + offset);
 }
 
-Byte2_t fetch_codestream2bytebigendian( codestream_param_t *cs, OPJ_OFF_T offset)
+Byte2_t fetch_codestream2bytebigendian(codestream_param_t *cs, OPJ_OFF_T offset)
 {
-  return fetch_2bytebigendian( cs->fd, cs->offset+offset);
+    return fetch_2bytebigendian(cs->fd, cs->offset + offset);
 }
 
-Byte4_t fetch_codestream4bytebigendian( codestream_param_t *cs, OPJ_OFF_T offset)
+Byte4_t fetch_codestream4bytebigendian(codestream_param_t *cs, OPJ_OFF_T offset)
 {
-  return fetch_4bytebigendian( cs->fd, cs->offset+offset);
+    return fetch_4bytebigendian(cs->fd, cs->offset + offset);
 }
 
-void print_codestream( codestream_param_t cs)
+void print_codestream(codestream_param_t cs)
 {
-  fprintf( logstream, "codestream info:\n"
-          "\t fd: %d\n"
-          "\t offset: %#" PRIx64 "\n"
-          "\t length: %#" PRIx64 "\n", cs.fd, cs.offset, cs.length);
+    fprintf(logstream, "codestream info:\n"
+            "\t fd: %d\n"
+            "\t offset: %#" PRIx64 "\n"
+            "\t length: %#" PRIx64 "\n", cs.fd, cs.offset, cs.length);
 }