make .h file identical to libtxc_dxtn's

diff --git a/libtxc_dxtn.h b/libtxc_dxtn.h
deleted file mode 100644 (file)
index 60c94f0..0000000
--- a/libtxc_dxtn.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef LIBTXC_DXTN_H
-#define LIBTXC_DXTN_H
-
-#include <GL/gl.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-void fetch_2d_texel_rgb_dxt1(GLint srcRowStride, const GLubyte *pixdata,
-                            GLint i, GLint j, GLvoid *texel);
-void fetch_2d_texel_rgba_dxt1(GLint srcRowStride, const GLubyte *pixdata,
-                            GLint i, GLint j, GLvoid *texel);
-void fetch_2d_texel_rgba_dxt3(GLint srcRowStride, const GLubyte *pixdata,
-                            GLint i, GLint j, GLvoid *texel);
-void fetch_2d_texel_rgba_dxt5(GLint srcRowStride, const GLubyte *pixdata,
-                            GLint i, GLint j, GLvoid *texel);
-void tx_compress_dxtn(GLint srccomps, GLint width, GLint height,
-                     const GLubyte *srcPixData, GLenum destFormat,
-                     GLubyte *dest, GLint dstRowStride);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

diff --git a/s2tc.cpp b/s2tc.cpp
index da6b5db..eec2ed6 100644 (file)
--- a/s2tc.cpp
+++ b/s2tc.cpp
@@ -5,9 +5,13 @@
 #include <stdint.h>
 #include <getopt.h>
 #include <algorithm>
-#include "libtxc_dxtn.h"
 #include "s2tc_common.h"
 
+extern "C"
+{
+#include "txc_dxtn.h"
+};
+
 /* START stuff that originates from image.c in DarkPlaces */
 // TODO CLEAR LICENSE STATE WITH LORDHAVOC, IF NEEDED, PUT THIS FILE UNDER GPL!
 int image_width, image_height;

diff --git a/s2tc_decompress.cpp b/s2tc_decompress.cpp
index 0f8eeb9..599e011 100644 (file)
--- a/s2tc_decompress.cpp
+++ b/s2tc_decompress.cpp
@@ -3,7 +3,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <algorithm>
-#include "libtxc_dxtn.h"
+
+extern "C"
+{
+#include "txc_dxtn.h"
+};
 
 uint32_t LittleLong(uint32_t w)
 {

diff --git a/s2tc_libtxc_dxtn.cpp b/s2tc_libtxc_dxtn.cpp
index 2aff85e..138a31e 100644 (file)
--- a/s2tc_libtxc_dxtn.cpp
+++ b/s2tc_libtxc_dxtn.cpp
@@ -1,4 +1,8 @@
-#include "libtxc_dxtn.h"
+extern "C"
+{
+#include "txc_dxtn.h"
+};
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -112,7 +116,7 @@ void fetch_2d_texel_rgba_dxt5(GLint srcRowStride, const GLubyte *pixdata,
 }
 
 void tx_compress_dxtn(GLint srccomps, GLint width, GLint height,
-                     const GLubyte *srcPixData, GLenum destFormat,
+                     const GLubyte *srcPixData, GLenum destformat,
                      GLubyte *dest, GLint dstRowStride)
 {
        // compresses width*height pixels (RGB or RGBA depending on srccomps) at srcPixData (packed) to destformat (dest, dstRowStride)
@@ -125,7 +129,7 @@ void tx_compress_dxtn(GLint srccomps, GLint width, GLint height,
        unsigned char *srcaddr;
        DxtMode dxt;
 
-       switch (destFormat) {
+       switch (destformat) {
                case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
                case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
                        dxt = DXT1;
@@ -141,7 +145,7 @@ void tx_compress_dxtn(GLint srccomps, GLint width, GLint height,
                        break;
                default:
                        free(rgba);
-                       fprintf(stderr, "libdxtn: Bad dstFormat %d in tx_compress_dxtn\n", destFormat);
+                       fprintf(stderr, "libdxtn: Bad dstFormat %d in tx_compress_dxtn\n", destformat);
                        return;
        }
 
@@ -193,7 +197,7 @@ void tx_compress_dxtn(GLint srccomps, GLint width, GLint height,
        }
 
        s2tc_encode_block_func_t encode_block = s2tc_encode_block_func(dxt, cd, nrandom, refine);
-       switch (destFormat) {
+       switch (destformat) {
                case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
                case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
                        /* hmm we used to get called without dstRowStride... */

diff --git a/txc_dxtn.h b/txc_dxtn.h
new file mode 100644 (file)
index 0000000..cd1095b
--- /dev/null
+++ b/txc_dxtn.h
@@ -0,0 +1,51 @@
+/*
+ * libtxc_dxtn
+ * Version:  1.0
+ *
+ * Copyright (C) 2004  Roland Scheidegger   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _TXC_DXTN_H
+#define _TXC_DXTN_H
+
+#include <GL/gl.h>
+
+typedef GLubyte GLchan;
+#define UBYTE_TO_CHAN(b)  (b)
+#define CHAN_MAX 255
+#define RCOMP 0
+#define GCOMP 1
+#define BCOMP 2
+#define ACOMP 3
+
+void fetch_2d_texel_rgb_dxt1(GLint srcRowStride, const GLubyte *pixdata,
+                            GLint i, GLint j, GLvoid *texel);
+void fetch_2d_texel_rgba_dxt1(GLint srcRowStride, const GLubyte *pixdata,
+                            GLint i, GLint j, GLvoid *texel);
+void fetch_2d_texel_rgba_dxt3(GLint srcRowStride, const GLubyte *pixdata,
+                            GLint i, GLint j, GLvoid *texel);
+void fetch_2d_texel_rgba_dxt5(GLint srcRowStride, const GLubyte *pixdata,
+                            GLint i, GLint j, GLvoid *texel);
+
+void tx_compress_dxtn(GLint srccomps, GLint width, GLint height,
+                     const GLubyte *srcPixData, GLenum destformat,
+                     GLubyte *dest, GLint dstRowStride);
+
+#endif /* _TXC_DXTN_H */