X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Fraw.c;h=49c38fd22e69b6ce2b160fec113a850629ee1652;hb=62ba44019992fac89cad65f7756f8ad13972c23c;hp=d752b8cd2f904af83a7a9008780946d07e145731;hpb=bef3bec50f674640783aed3d3c4cbcdd3fb919d7;p=gdcm.git

diff --git a/src/gdcmopenjpeg/libopenjpeg/raw.c b/src/gdcmopenjpeg/libopenjpeg/raw.c
index d752b8cd..49c38fd2 100644
--- a/src/gdcmopenjpeg/libopenjpeg/raw.c
+++ b/src/gdcmopenjpeg/libopenjpeg/raw.c
@@ -1,86 +1,86 @@
-/*
- * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervé Drolon, FreeImage Team
- * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "opj_includes.h"
-
-/* 
-==========================================================
-   local functions
-==========================================================
-*/
-
-
-/* 
-==========================================================
-   RAW encoding interface
-==========================================================
-*/
-
-opj_raw_t* raw_create() {
-  opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t));
-  return raw;
-}
-
-void raw_destroy(opj_raw_t *raw) {
-  if(raw) {
-    opj_free(raw);
-  }
-}
-
-int raw_numbytes(opj_raw_t *raw) {
-  return raw->bp - raw->start;
-}
-
-void raw_init_dec(opj_raw_t *raw, unsigned char *bp, int len) {
-  raw->start = bp;
-  raw->lenmax = len;
-  raw->len = 0;
-  raw->c = 0;
-  raw->ct = 0;
-}
-
-int raw_decode(opj_raw_t *raw) {
-  int d;
-  if (raw->ct == 0) {
-    raw->ct = 8;
-    if (raw->len == raw->lenmax) {
-      raw->c = 0xff;
-    } else {
-      if (raw->c == 0xff) {
-        raw->ct = 7;
-      }
-      raw->c = *(raw->start + raw->len);
-      raw->len++;
-    }
-  }
-  raw->ct--;
-  d = (raw->c >> raw->ct) & 0x01;
-  
-  return d;
-}
-
+/*
+ * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/* 
+==========================================================
+   local functions
+==========================================================
+*/
+
+
+/* 
+==========================================================
+   RAW encoding interface
+==========================================================
+*/
+
+opj_raw_t* raw_create() {
+  opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t));
+  return raw;
+}
+
+void raw_destroy(opj_raw_t *raw) {
+  if(raw) {
+    opj_free(raw);
+  }
+}
+
+int raw_numbytes(opj_raw_t *raw) {
+  return raw->bp - raw->start;
+}
+
+void raw_init_dec(opj_raw_t *raw, unsigned char *bp, int len) {
+  raw->start = bp;
+  raw->lenmax = len;
+  raw->len = 0;
+  raw->c = 0;
+  raw->ct = 0;
+}
+
+int raw_decode(opj_raw_t *raw) {
+  int d;
+  if (raw->ct == 0) {
+    raw->ct = 8;
+    if (raw->len == raw->lenmax) {
+      raw->c = 0xff;
+    } else {
+      if (raw->c == 0xff) {
+        raw->ct = 7;
+      }
+      raw->c = *(raw->start + raw->len);
+      raw->len++;
+    }
+  }
+  raw->ct--;
+  d = (raw->c >> raw->ct) & 0x01;
+  
+  return d;
+}
+