diff options
| author | Giuseppe Baruffa <gbaruffa@users.noreply.github.com> | 2007-02-23 01:23:05 +0000 |
|---|---|---|
| committer | Giuseppe Baruffa <gbaruffa@users.noreply.github.com> | 2007-02-23 01:23:05 +0000 |
| commit | 8a75823eeaa6f36c428a848d757e7d94ce4386f1 (patch) | |
| tree | 35cbd0c3181e404833790c0c1e04c0879d868bad /jpwl | |
| parent | e841b13166218ba152595a7c0adf5b70c4e5558d (diff) | |
Fixed a copy-and-paste type assignment error (bool instead of int) in the JPWL section of decoder parameters structure in openjpeg.h; minor type-casting in jpwl_lib.c. As a result, now OPJViewer should run correctly when built against the most current SVN trunk of LibOpenJPEG.lib
Diffstat (limited to 'jpwl')
| -rw-r--r-- | jpwl/LibOpenJPEG_JPWL.dsp | 8 | ||||
| -rw-r--r-- | jpwl/jpwl_lib.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jpwl/LibOpenJPEG_JPWL.dsp b/jpwl/LibOpenJPEG_JPWL.dsp index 58b92973..68ee908c 100644 --- a/jpwl/LibOpenJPEG_JPWL.dsp +++ b/jpwl/LibOpenJPEG_JPWL.dsp @@ -37,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "LibOpenJPEG_JPWL___Win32_Release"
-# PROP Intermediate_Dir "LibOpenJPEG_JPWL___Win32_Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /YX /FD /c
@@ -60,8 +60,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "LibOpenJPEG_JPWL___Win32_Debug"
-# PROP Intermediate_Dir "LibOpenJPEG_JPWL___Win32_Debug"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /YX /FD /GZ /c
diff --git a/jpwl/jpwl_lib.c b/jpwl/jpwl_lib.c index 656ca7e5..96e6f69d 100644 --- a/jpwl/jpwl_lib.c +++ b/jpwl/jpwl_lib.c @@ -1483,7 +1483,7 @@ bool jpwl_esd_fill(opj_j2k_t *j2k, jpwl_esd_ms_t *esd, unsigned char *buf) { else /* packet: first is most important, and then in decreasing order down to the last, which counts for 1 */ - dvalue = jpwl_pfp_to_double(j2k->image_info->num - thispacket, esd->se_size); + dvalue = jpwl_pfp_to_double((unsigned short) (j2k->image_info->num - thispacket), esd->se_size); break; /* MSE */ |