Merge pull request #647 from stweil/master

[openjpeg.git] / src / lib / openmj2 / openjpeg.c

diff --git a/src/lib/openmj2/openjpeg.c b/src/lib/openmj2/openjpeg.c
index 3e620817fbf470ab8c99e753693bb38194d36345..a2621f5dce096e585e1da4055ac313b4e1a9865d 100644 (file)
--- a/src/lib/openmj2/openjpeg.c
+++ b/src/lib/openmj2/openjpeg.c
@@ -1,4 +1,9 @@
 /*
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
@@ -28,7 +33,7 @@
 #include <windows.h>
 #endif /* _WIN32 */
 
-#include "opj_config.h"
+#include "opj_config_private.h"
 #include "opj_includes.h"
 
 /* ---------------------------------------------------------------------- */
@@ -249,7 +254,6 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
     parameters->cp_disto_alloc = 0;
                parameters->cp_fixed_alloc = 0;
                parameters->cp_fixed_quality = 0;
-               parameters->jpip_on = OPJ_FALSE;
 /* UniPG>> */
 #ifdef USE_JPWL
                parameters->jpwl_epc_on = OPJ_FALSE;