aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorTilman Keskinoz <arved@FreeBSD.org>2007-08-09 20:22:24 +0000
committerTilman Keskinoz <arved@FreeBSD.org>2007-08-09 20:22:24 +0000
commitb3291f8f2958bd4b6c5ffac854d92a9aa22ca757 (patch)
tree660ceef288e2a0a76d0a4f50dbc6c978bd2b5f1b /devel
parentd79579befe964dd920b81c6ee0845f538979fdb6 (diff)
downloadports-b3291f8f2958bd4b6c5ffac854d92a9aa22ca757.tar.gz
ports-b3291f8f2958bd4b6c5ffac854d92a9aa22ca757.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/clanlib/files/patch-Sources::GUI::messagebox_generic.h11
-rw-r--r--devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jpegdecoder.cpp29
-rw-r--r--devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jpegdecoder.h45
3 files changed, 85 insertions, 0 deletions
diff --git a/devel/clanlib/files/patch-Sources::GUI::messagebox_generic.h b/devel/clanlib/files/patch-Sources::GUI::messagebox_generic.h
new file mode 100644
index 000000000000..a6679fd661a5
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::GUI::messagebox_generic.h
@@ -0,0 +1,11 @@
+--- Sources/GUI/messagebox_generic.h.orig Wed May 30 21:37:42 2007
++++ Sources/GUI/messagebox_generic.h Wed May 30 21:38:24 2007
+@@ -26,7 +26,7 @@
+ const std::string &button2,
+ const std::string &button3);
+
+- CL_MessageBox_Generic::~CL_MessageBox_Generic();
++ ~CL_MessageBox_Generic();
+
+ void set_text(const std::string &text);
+
diff --git a/devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jpegdecoder.cpp b/devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jpegdecoder.cpp
new file mode 100644
index 000000000000..fa0c3eae93ba
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jpegdecoder.cpp
@@ -0,0 +1,29 @@
+--- Sources/SmallJPEG/jpgd/jpegdecoder.cpp.orig 2007-08-09 21:32:35.000000000 +0200
++++ Sources/SmallJPEG/jpgd/jpegdecoder.cpp 2007-08-09 21:35:03.000000000 +0200
+@@ -102,7 +102,7 @@
+ blocks[i] = q;
+
+ // Round to qword boundry, to avoid misaligned accesses with MMX code
+- return ((void *)(((uint)q + 7) & ~7));
++ return ((void *)(((ulong)q + 7) & ~7));
+ }
+ //------------------------------------------------------------------------------
+ // Clear buffer to word values.
+@@ -1870,7 +1870,7 @@
+ q = (uchar *)alloc(max_blocks_per_row * 64 * sizeof(BLOCK_TYPE) + 8);
+
+ // Align to 8-byte boundry, for MMX code
+- q = (uchar *)(((uint)q + 7) & ~7);
++ q = (uchar *)(((ulong)q + 7) & ~7);
+
+ // The block_seg[] array's name dates back to the
+ // 16-bit assembler implementation. "seg" stood for "segment".
+@@ -1880,7 +1880,7 @@
+ for (i = 0; i < max_blocks_per_row; i++)
+ block_max_zag_set[i] = 64;
+
+- Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
++ Psample_buf = (uchar *)(((ulong)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
+
+ total_lines_left = image_y_size;
+
diff --git a/devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jpegdecoder.h b/devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jpegdecoder.h
new file mode 100644
index 000000000000..d46537e5e06c
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources::SmallJPEG::jpgd::jpegdecoder.h
@@ -0,0 +1,45 @@
+--- Sources/SmallJPEG/jpgd/jpegdecoder.h.orig Wed May 30 21:51:53 2007
++++ Sources/SmallJPEG/jpgd/jpegdecoder.h Wed May 30 21:53:54 2007
+@@ -493,26 +493,26 @@
+
+ void find_eoi(void);
+ //------------------
+- /*inline*/ uint jpeg_decoder::rol(uint i, uchar j);
+- /*inline*/ uint jpeg_decoder::get_char(void);
+- /*inline*/ uint jpeg_decoder::get_char(bool *Ppadding_flag);
+- /*inline*/ void jpeg_decoder::stuff_char(uchar q);
+- /*inline*/ uchar jpeg_decoder::get_octet(void);
+- /*inline*/ uint jpeg_decoder::get_bits_1(int num_bits);
+- /*inline*/ uint jpeg_decoder::get_bits_2(int numbits);
+- /*inline*/ int jpeg_decoder::huff_decode(Phuff_tables_t Ph);
++ /*inline*/ uint rol(uint i, uchar j);
++ /*inline*/ uint get_char(void);
++ /*inline*/ uint get_char(bool *Ppadding_flag);
++ /*inline*/ void stuff_char(uchar q);
++ /*inline*/ uchar get_octet(void);
++ /*inline*/ uint get_bits_1(int num_bits);
++ /*inline*/ uint get_bits_2(int numbits);
++ /*inline*/ int huff_decode(Phuff_tables_t Ph);
+ #ifdef SUPPORT_X86ASM
+- /*inline*/ uint jpeg_decoder::huff_extend(uint i, int c);
++ /*inline*/ uint huff_extend(uint i, int c);
+ #endif
+- /*inline*/ uchar jpeg_decoder::clamp(int i);
++ /*inline*/ uchar clamp(int i);
+
+ #ifdef SUPPORT_MMX
+- /*inline*/ uint jpeg_decoder::get_high_byte_mmx(void);
+- /*inline*/ uint jpeg_decoder::get_high_word_mmx(void);
+- /*inline*/ void jpeg_decoder::get_bits_2_mmx_init(void);
+- /*inline*/ void jpeg_decoder::get_bits_2_mmx_deinit(void);
+- /*inline*/ uint jpeg_decoder::get_bits_2_mmx(int numbits);
+- /*inline*/ int jpeg_decoder::huff_decode_mmx(Phuff_tables_t Ph);
++ /*inline*/ uint get_high_byte_mmx(void);
++ /*inline*/ uint get_high_word_mmx(void);
++ /*inline*/ void get_bits_2_mmx_init(void);
++ /*inline*/ void get_bits_2_mmx_deinit(void);
++ /*inline*/ uint get_bits_2_mmx(int numbits);
++ /*inline*/ int huff_decode_mmx(Phuff_tables_t Ph);
+ #endif
+ //------------------
+ int image_x_size;