diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 09:20:13 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 09:20:13 +0000 |
| commit | 9e52c330ae5e00b40401c90e59f13600d5bcb907 (patch) | |
| tree | 3eca46dd8e6dabb9c288d4fd941e565ba22bf5c9 /applications/JavaOpenJPEG/JavaOpenJPEG.c | |
| parent | 564deec2c4c11abc173906bea3176a7d03b9e744 (diff) | |
[trunk] Remove copyrighted material from java-jni. Import patch from 1.5 over to trunk/JavaOpenJPEG
Diffstat (limited to 'applications/JavaOpenJPEG/JavaOpenJPEG.c')
| -rw-r--r-- | applications/JavaOpenJPEG/JavaOpenJPEG.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/applications/JavaOpenJPEG/JavaOpenJPEG.c b/applications/JavaOpenJPEG/JavaOpenJPEG.c index eea41c25..3f8e2ee7 100644 --- a/applications/JavaOpenJPEG/JavaOpenJPEG.c +++ b/applications/JavaOpenJPEG/JavaOpenJPEG.c @@ -380,7 +380,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres){ }
void cinema_parameters(opj_cparameters_t *parameters){
- parameters->tile_size_on = false;
+ parameters->tile_size_on = OPJ_FALSE;
parameters->cp_tdx=1;
parameters->cp_tdy=1;
@@ -663,7 +663,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, case 't': /* tiles */
{
sscanf(opj_optarg, "%d,%d", ¶meters->cp_tdx, ¶meters->cp_tdy);
- parameters->tile_size_on = true;
+ parameters->tile_size_on = OPJ_TRUE;
}
break;
@@ -1628,7 +1628,7 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, jbyte *jbBody;
jshort *jsBody;
jint *jiBody;
- boolean isCopy;
+ jboolean isCopy;
// Image width, height and depth
fid = (*env)->GetFieldID(env, cls,"width", "I");
@@ -1776,7 +1776,7 @@ opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImageToJ2K(JNIEnv *env, jobject obj, jobjectArray javaParameters) {
int argc; /* To simulate the command line parameters (taken from the javaParameters variable) and be able to re-use the */
char **argv; /* 'parse_cmdline_decoder' method taken from the j2k_to_image project */
- bool bSuccess;
+ opj_bool bSuccess;
opj_cparameters_t parameters; /* compression parameters */
img_fol_t img_fol;
opj_event_mgr_t event_mgr; /* event manager */
|