Inline opj_raw_decode()

3 files changed, 63 insertions, 23 deletions

diff --git a/src/lib/openjp2/raw.c b/src/lib/openjp2/raw.c
index 516d63fb..51f91492 100644
--- a/src/lib/openjp2/raw.c
+++ b/src/lib/openjp2/raw.c
@@ -76,25 +76,3 @@ void opj_raw_init_dec(opj_raw_t *raw, OPJ_BYTE *bp, OPJ_UINT32 len)
     raw->c = 0;
     raw->ct = 0;
 }
-
-OPJ_UINT32 opj_raw_decode(opj_raw_t *raw)
-{
-    OPJ_UINT32 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 = ((OPJ_UINT32)raw->c >> raw->ct) & 0x01U;
-
-    return d;
-}
-
diff --git a/src/lib/openjp2/raw.h b/src/lib/openjp2/raw.h
index 9a32c83d..dfb0ae01 100644
--- a/src/lib/openjp2/raw.h
+++ b/src/lib/openjp2/raw.h
@@ -66,6 +66,8 @@ typedef struct opj_raw {
     OPJ_BYTE *end;
 } opj_raw_t;
 
+#include "raw_inl.h"
+
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */
@@ -97,7 +99,7 @@ Decode a symbol using raw-decoder. Cfr p.506 TAUBMAN
 @param raw RAW handle
 @return Returns the decoded symbol (0 or 1)
 */
-OPJ_UINT32 opj_raw_decode(opj_raw_t *raw);
+static INLINE OPJ_UINT32 opj_raw_decode(opj_raw_t *raw);
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
diff --git a/src/lib/openjp2/raw_inl.h b/src/lib/openjp2/raw_inl.h
new file mode 100644
index 00000000..b2ec0591
--- /dev/null
+++ b/src/lib/openjp2/raw_inl.h
@@ -0,0 +1,60 @@
+/*
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
+ * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * 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.
+ */
+
+/**
+Decode a symbol using raw-decoder. Cfr p.506 TAUBMAN
+@param raw RAW handle
+@return Returns the decoded symbol (0 or 1)
+*/
+static INLINE OPJ_UINT32 opj_raw_decode(opj_raw_t *raw)
+{
+    OPJ_UINT32 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 = ((OPJ_UINT32)raw->c >> raw->ct) & 0x01U;
+
+    return d;
+}