fixed various minor warnings with gdcm patches

[openjpeg.git] / libopenjpeg / mct.c

diff --git a/libopenjpeg/mct.c b/libopenjpeg/mct.c
index 185c1b66dc351a6fadba150bd1a14e679e8df667..f41c9ab05baed69375bd5bcebd2f3e360f4ed0a8 100644 (file)
--- a/libopenjpeg/mct.c
+++ b/libopenjpeg/mct.c
@@ -1,5 +1,9 @@
 /*
- * Copyright (c) 2001-2002, David Janssens
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * 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
@@ -24,111 +28,104 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mct.h"
-#include "fix.h"
+#include "opj_includes.h"
 
 /* <summary> */
 /* This table contains the norms of the basis function of the reversible MCT. */
 /* </summary> */
-double mct_norms[3] = { 1.732, .8292, .8292 };
+static const double mct_norms[3] = { 1.732, .8292, .8292 };
 
 /* <summary> */
 /* This table contains the norms of the basis function of the irreversible MCT. */
 /* </summary> */
-double mct_norms_real[3] = { 1.732, 1.805, 1.573 };
+static const double mct_norms_real[3] = { 1.732, 1.805, 1.573 };
 
 /* <summary> */
 /* Foward reversible MCT. */
 /* </summary> */
-void mct_encode(int *c0, int *c1, int *c2, int n)
-{
-  int i;
-  for (i = 0; i < n; i++) {
-    int r, g, b, y, u, v;
-    r = c0[i];
-    g = c1[i];
-    b = c2[i];
-    y = (r + (g << 1) + b) >> 2;
-    u = b - g;
-    v = r - g;
-    c0[i] = y;
-    c1[i] = u;
-    c2[i] = v;
-  }
+void mct_encode(int *c0, int *c1, int *c2, int n) {
+       int i;
+       for (i = 0; i < n; i++) {
+               int r, g, b, y, u, v;
+               r = c0[i];
+               g = c1[i];
+               b = c2[i];
+               y = (r + (g << 1) + b) >> 2;
+               u = b - g;
+               v = r - g;
+               c0[i] = y;
+               c1[i] = u;
+               c2[i] = v;
+       }
 }
 
 /* <summary> */
 /* Inverse reversible MCT. */
 /* </summary> */
-void mct_decode(int *c0, int *c1, int *c2, int n)
-{
-  int i;
-  for (i = 0; i < n; i++) {
-    int y, u, v, r, g, b;
-    y = c0[i];
-    u = c1[i];
-    v = c2[i];
-    g = y - ((u + v) >> 2);
-    r = v + g;
-    b = u + g;
-    c0[i] = r;
-    c1[i] = g;
-    c2[i] = b;
-  }
+void mct_decode(int *c0, int *c1, int *c2, int n) {
+       int i;
+       for (i = 0; i < n; i++) {
+               int y, u, v, r, g, b;
+               y = c0[i];
+               u = c1[i];
+               v = c2[i];
+               g = y - ((u + v) >> 2);
+               r = v + g;
+               b = u + g;
+               c0[i] = r;
+               c1[i] = g;
+               c2[i] = b;
+       }
 }
 
 /* <summary> */
 /* Get norm of basis function of reversible MCT. */
 /* </summary> */
-double mct_getnorm(int compno)
-{
-  return mct_norms[compno];
+double mct_getnorm(int compno) {
+       return mct_norms[compno];
 }
 
 /* <summary> */
 /* Foward irreversible MCT. */
 /* </summary> */
-void mct_encode_real(int *c0, int *c1, int *c2, int n)
-{
-  int i;
-  for (i = 0; i < n; i++) {
-    int r, g, b, y, u, v;
-    r = c0[i];
-    g = c1[i];
-    b = c2[i];
-    y = fix_mul(r, 2449) + fix_mul(g, 4809) + fix_mul(b, 934);
-    u = -fix_mul(r, 1382) - fix_mul(g, 2714) + fix_mul(b, 4096);
-    v = fix_mul(r, 4096) - fix_mul(g, 3430) - fix_mul(b, 666);
-    c0[i] = y;
-    c1[i] = u;
-    c2[i] = v;
-  }
+void mct_encode_real(int *c0, int *c1, int *c2, int n) {
+       int i;
+       for (i = 0; i < n; i++) {
+               int r, g, b, y, u, v;
+               r = c0[i];
+               g = c1[i];
+               b = c2[i];
+               y = fix_mul(r, 2449) + fix_mul(g, 4809) + fix_mul(b, 934);
+               u = -fix_mul(r, 1382) - fix_mul(g, 2714) + fix_mul(b, 4096);
+               v = fix_mul(r, 4096) - fix_mul(g, 3430) - fix_mul(b, 666);
+               c0[i] = y;
+               c1[i] = u;
+               c2[i] = v;
+       }
 }
 
 /* <summary> */
 /* Inverse irreversible MCT. */
 /* </summary> */
-void mct_decode_real(int *c0, int *c1, int *c2, int n)
-{
-  int i;
-  for (i = 0; i < n; i++) {
-    int y, u, v, r, g, b;
-    y = c0[i];
-    u = c1[i];
-    v = c2[i];
-    r = y + fix_mul(v, 11485);
-    g = y - fix_mul(u, 2819) - fix_mul(v, 5850);
-    b = y + fix_mul(u, 14516);
-    c0[i] = r;
-    c1[i] = g;
-    c2[i] = b;
-  }
+void mct_decode_real(int *c0, int *c1, int *c2, int n) {
+       int i;
+       for (i = 0; i < n; i++) {
+               int y, u, v, r, g, b;
+               y = c0[i];
+               u = c1[i];
+               v = c2[i];
+               r = y + fix_mul(v, 11485);
+               g = y - fix_mul(u, 2819) - fix_mul(v, 5850);
+               b = y + fix_mul(u, 14516);
+               c0[i] = r;
+               c1[i] = g;
+               c2[i] = b;
+       }
 }
 
 /* <summary> */
 /* Get norm of basis function of irreversible MCT. */
 /* </summary> */
-double mct_getnorm_real(int compno)
-{
-  return mct_norms_real[compno];
+double mct_getnorm_real(int compno) {
+       return mct_norms_real[compno];
 }