Commit Graph

29 Commits

Author SHA1 Message Date
Latif Khalifa
3731ee4111 Compile openjpeg in 32 bit mode on OS X 2012-11-01 04:11:59 +01:00
Latif Khalifa
f8adcd0a37 arch cmd is depreciated on some distros. using 'uname -m' instead 2012-09-19 05:05:39 +02:00
Justin Clark-Casey
7d6c7b73fc Update mac openjpeg to 1.5 and Makefile.osx 2012-09-06 23:58:48 +01:00
justincc
e4b2493598 Update windows openjpeg dlls to 1.5
Also updates DllOpenJPEG.vcproj
2012-09-06 23:09:10 +01:00
Justin Clark-Casey
2b881849e2 Remove some temporary files that I just added by mistake 2012-09-06 22:55:34 +01:00
Justin Clark-Casey
854f95c4c8 Add more libopenjpeg 1.5 files that I forgot were new 2012-09-06 22:54:40 +01:00
Justin Clark-Casey
f3e3f534cf Add new necessary opj_config.h file with openjpeg 1.5 2012-09-06 22:51:37 +01:00
Justin Clark-Casey
d7ad73f5c2 Update libopenjpeg to 1.5 on Linux 32 and 64-bit.
I also took the liberty of changing the library name from libopenjpeg-dotnet-2.1.3.0-dotnet-1*.so to libopenjpeg-dotnet-2-1.5.0-dotnet-1*.so
To me, "2.1.3.0" looked like a full version number whereas it is really "2" and libopenjpeg "1.3.0"
Not sure what the "2" is, maybe dotnet 2
However, it might be better to get rid of this version information altogether - after all the openjpeg-dotnet.dll libraries do not have it
2012-09-06 22:40:39 +01:00
Latif Khalifa
75305fc3a0 LIBOMV-833: Extra space in openjpeg-dotnet/Makefile messes up with the build on S390X architecture
Patch by Aurelien Minvielle

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3345 52acb1d6-8a22-11de-b505-999d5b087335
2010-05-14 20:55:29 +00:00
Jim Radford
fcdc1649ca openjpeg: November 5, 2009 fixed MCT check bug in t1_getwmsedec. See http://groups.google.com/group/openjpeg/browse_thread/thread/d9d96dd4ec3e7443 for info.
openjpeg svn r541

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3218 52acb1d6-8a22-11de-b505-999d5b087335
2009-11-07 22:38:19 +00:00
baba
b314c9a2e9 attempted fix for LIBOMV-692 occasional crash during decode.
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3112 52acb1d6-8a22-11de-b505-999d5b087335
2009-09-22 23:48:19 +00:00
Jim Radford
a469d8239f Updated OpenJpeg solution file for 64bit platform target, name is now "Win64" and output is now libopenjpeg-x86_64.dll forgot the .vcproj file in last commit
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3107 52acb1d6-8a22-11de-b505-999d5b087335
2009-08-28 21:31:52 +00:00
Jim Radford
ce345eab12 Updated OpenJpeg solution file for 64bit platform target, name is now "Win64" and output is now libopenjpeg-x86_64.dll
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3106 52acb1d6-8a22-11de-b505-999d5b087335
2009-08-28 21:30:50 +00:00
Latif Khalifa
9183efecf2 Revert the last commit
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3102 52acb1d6-8a22-11de-b505-999d5b087335
2009-08-22 22:12:28 +00:00
Latif Khalifa
1f1c18ceae Use macro to rename function on Win64
Add WIN64 define in addition to WIN32 when compiling on Win64

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3101 52acb1d6-8a22-11de-b505-999d5b087335
2009-08-22 21:14:43 +00:00
Jim Radford
60b8a2df0e LIBOMV-681 Adds 64 bit export stubs to openjpeg-dotnet, Thanks Robert Adams for the report
* This changes the 32bit exported dll functions back to what they were, and adds the 64 bit dll exports
* Includes windows.h instead of afxrs.h which isn't included with Express Editions of Visual Studio Express

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3099 52acb1d6-8a22-11de-b505-999d5b087335
2009-08-22 20:46:17 +00:00
Robin Cornelius
173340f263 Ensure openjpeg does not overrun the MCT array when encoding images with alpha channels
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3091 52acb1d6-8a22-11de-b505-999d5b087335
2009-08-18 19:49:46 +00:00
Jim Radford
1d007275bd LIBOMV-663 Updates to OpenJpeg makefile/solutions files
* Makefile support IBM s390 and PPC architecture (patch courtesy of sdague)
* Visual studio x64 platform added for compiling openjpeg-dotnet on 64 bit windows platforms

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3067 52acb1d6-8a22-11de-b505-999d5b087335
2009-08-06 21:22:59 +00:00
Jim Radford
886167727d Updates openjpeg solution files to 2008 version
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2653 52acb1d6-8a22-11de-b505-999d5b087335
2009-04-24 06:14:18 +00:00
Jim Radford
c8995fd538 Updates openjpeg 32/64 bit binaries on Linux, Adds support to openjpeg
to compile 32bit binary on 64 bit platform, renames openjpeg 32 bit
binary (appends arch to shared library name), 

To force 32 bit compilation on a 64 bit linux platform:
make clean ; make ARCH=-i686 ARCHFLAGS=-m32


git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2411 52acb1d6-8a22-11de-b505-999d5b087335
2009-01-08 23:55:32 +00:00
John Hurliman
01d0bda781 Committing openjpeg-dotnet crash fix from HomerHorwitz and compiled Windows (32-bit) binary. Still need to compile for the other platforms
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2406 52acb1d6-8a22-11de-b505-999d5b087335
2009-01-07 02:28:26 +00:00
John Hurliman
52eb143b44 Changing some optimized assembly to standard C code to get openjpeg-dotnet compiling on 64-bit Windows
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2372 52acb1d6-8a22-11de-b505-999d5b087335
2008-12-05 18:04:44 +00:00
John Hurliman
d4cc4e96e6 Updating the openjpeg binaries for Linux/Linux64/OSX. Using a new naming convention of libopenjpeg-dotnet-[openjpeg-version]-dotnet-[patch-version], so Makefile/Makefile.osx/OpenMetaverse.dll.config has been updated as well
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2358 52acb1d6-8a22-11de-b505-999d5b087335
2008-11-17 19:32:05 +00:00
John Hurliman
f11dd21677 * Forced struct alignment to 4-bytes for openjpeg-dotnet on Windows
* Removed padding hack from openjpeg
* Added sanity check to Simian when copying texture data
* Ignore common unused login parameters in Simian

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2357 52acb1d6-8a22-11de-b505-999d5b087335
2008-11-17 19:08:50 +00:00
John Hurliman
a7e0fb7860 Hacky fix to force 8-byte alignment on a misbehaving struct in OpenJPEG
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2353 52acb1d6-8a22-11de-b505-999d5b087335
2008-11-15 02:28:36 +00:00
Jim Radford
cd075240a9 LIBOMV-330 Corrects openjpeg Unix makefile to produce proper 32/64 bit filenames which match the binaries
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2198 52acb1d6-8a22-11de-b505-999d5b087335
2008-09-06 04:14:59 +00:00
John Hurliman
a14fdabe8b * Removing unnecessary C++ wrappers from openjpeg-dotnet
* Added DotNetDecodeWithInfo() to openjpeg-dotnet to decode and gather additional data about the image
* Updating openjpeg.dotnet.dll windows binary. OSX, Linux, and Linux64 compiles needed again

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2171 52acb1d6-8a22-11de-b505-999d5b087335
2008-08-27 02:36:28 +00:00
Jim Radford
e43a9a1052 LIBOMV-328 Updates openjpeg-dotnet dotnet.h/dotnet.cpp to use new function names
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2007 52acb1d6-8a22-11de-b505-999d5b087335
2008-07-27 10:06:45 +00:00
John Hurliman
d7812d4a32 Step three of [LIBOMV-318], renaming the folder to openjpeg-dotnet and updating libsecondlife.build to exclude anything named *openjpeg-dotnet* from cleanup
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1955 52acb1d6-8a22-11de-b505-999d5b087335
2008-07-22 19:45:14 +00:00