Updated the MJ2 codec to be compatible with the recent changes in the OpenJPEG library.

5 files changed, 20 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index ddb8977c..d681d94c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+September 12, 2007
+* [FOD] Updated the MJ2 codec to be compatible with the recent changes in the OpenJPEG library
+
 September 11, 2007
 * [GB] JPWL encoding is finalized correctly into the JP2 file format; added an additional structure in opj_codestream_info, to keep a record of the written markers
 
diff --git a/mj2/meta_out.c b/mj2/meta_out.c
index c77ec20a..b6c99e13 100644
--- a/mj2/meta_out.c
+++ b/mj2/meta_out.c
@@ -945,7 +945,7 @@ int xml_out_frame(FILE* file, FILE* xmlout, mj2_sample_t *sample, unsigned int s
 	cio = opj_cio_open((opj_common_ptr)dinfo, frame_codestream, sample->sample_size-8);
 
   /* Decode J2K to image: */
-	img = opj_decode(dinfo, cio);
+	img = opj_decode(dinfo, cio, NULL);		/* We don't need cstr_info -> set to NULL */
   if (!img) {
 		fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
 		opj_destroy_decompress(dinfo);
diff --git a/mj2/mj2_to_frames.c b/mj2/mj2_to_frames.c
index bf4dfe6b..6eae57f0 100644
--- a/mj2/mj2_to_frames.c
+++ b/mj2/mj2_to_frames.c
@@ -160,7 +160,7 @@ int main(int argc, char *argv[]) {
 		/* open a byte stream */
 		cio = opj_cio_open((opj_common_ptr)dinfo, frame_codestream, sample->sample_size-8);
 		
-		img = opj_decode(dinfo, cio); // Decode J2K to image
+		img = opj_decode(dinfo, cio, NULL); // Decode J2K to image. We will not use the cstr_info afterwards -> set to NULL
 				
     if (((img->numcomps == 3) && (img->comps[0].dx == img->comps[1].dx / 2) 
       && (img->comps[0].dx == img->comps[2].dx / 2 ) && (img->comps[0].dx == 1)) 
diff --git a/mj2/mj2_to_metadata.sln b/mj2/mj2_to_metadata.sln
index 7cfbb6f2..32b926d4 100644
--- a/mj2/mj2_to_metadata.sln
+++ b/mj2/mj2_to_metadata.sln
@@ -1,12 +1,12 @@
 

 Microsoft Visual Studio Solution File, Format Version 9.00

 # Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mj2_to_metadata", "mj2_to_metadata.vcproj", "{5B7DCDB5-EA9B-4F31-AAE8-44B2DBD44060}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mj2_to_metadata", "mj2_to_metadata.vcproj", "{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}"

 	ProjectSection(ProjectDependencies) = postProject

-		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD} = {0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOpenJPEG", "..\LibOpenJPEG.vcproj", "{4F27AA53-4181-4A1A-8238-3931B0A41048}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOpenJPEG", "..\LibOpenJPEG.vcproj", "{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -14,14 +14,14 @@ Global
 		Release|Win32 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{5B7DCDB5-EA9B-4F31-AAE8-44B2DBD44060}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5B7DCDB5-EA9B-4F31-AAE8-44B2DBD44060}.Debug|Win32.Build.0 = Debug|Win32

-		{5B7DCDB5-EA9B-4F31-AAE8-44B2DBD44060}.Release|Win32.ActiveCfg = Release|Win32

-		{5B7DCDB5-EA9B-4F31-AAE8-44B2DBD44060}.Release|Win32.Build.0 = Release|Win32

-		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Debug|Win32.ActiveCfg = Debug|Win32

-		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Debug|Win32.Build.0 = Debug|Win32

-		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Release|Win32.ActiveCfg = Release|Win32

-		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Release|Win32.Build.0 = Release|Win32

+		{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}.Debug|Win32.Build.0 = Debug|Win32

+		{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}.Release|Win32.ActiveCfg = Release|Win32

+		{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}.Release|Win32.Build.0 = Release|Win32

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}.Debug|Win32.ActiveCfg = Debug|Win32

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}.Debug|Win32.Build.0 = Debug|Win32

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}.Release|Win32.ActiveCfg = Release|Win32

+		{0B1B7713-35B6-40A7-9BFF-A7D0EB06A8BD}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/mj2/mj2_to_metadata.vcproj b/mj2/mj2_to_metadata.vcproj
index e7cde7d0..4207365c 100644
--- a/mj2/mj2_to_metadata.vcproj
+++ b/mj2/mj2_to_metadata.vcproj
@@ -1,9 +1,9 @@
-                                   <?xml version="1.0" encoding="Windows-1252"?>

+<?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8,00"

 	Name="mj2_to_metadata"

-	ProjectGUID="{5B7DCDB5-EA9B-4F31-AAE8-44B2DBD44060}"

+	ProjectGUID="{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}"

 	>

 	<Platforms>

 		<Platform

@@ -73,7 +73,7 @@
 				OutputFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames="libc"

+				IgnoreDefaultLibraryNames="LIBCMT"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.pdb"

 				SubSystem="1"

@@ -165,7 +165,7 @@
 				OutputFile=".\Release/mj2_to_metadata.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				IgnoreDefaultLibraryNames="libc"

+				IgnoreDefaultLibraryNames="libcmtd"

 				ProgramDatabaseFile=".\Release/mj2_to_metadata.pdb"

 				SubSystem="1"

 				TargetMachine="1"