Revision 1180

View differences:

trunk/libraries/libjni-mrsid/.cdtproject
20 20 
<buildArguments>/f makefile.w32</buildArguments>
21 21 
<buildTarget>java</buildTarget>
22 22 
<stopOnError>false</stopOnError>
23 
<useDefaultCommand>false</useDefaultCommand>
23 
<useDefaultCommand>true</useDefaultCommand>
24 24 
</target>
25 25 
<target name="header" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
26 26 
<buildCommand>nmake</buildCommand>
27 27 
<buildArguments>/f makefile.w32</buildArguments>
28 28 
<buildTarget>header</buildTarget>
29 29 
<stopOnError>false</stopOnError>
30 
<useDefaultCommand>false</useDefaultCommand>
30 
<useDefaultCommand>true</useDefaultCommand>
31 31 
</target>
32 32 
<target name="libc" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
33 33 
<buildCommand>nmake</buildCommand>
......
44 44 
<useDefaultCommand>false</useDefaultCommand>
45 45 
</target>
46 46 
<target name="jar" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
47 
<buildCommand>nmake</buildCommand>
48 
<buildArguments>/f makefile.w32</buildArguments>
47 
<buildCommand>make</buildCommand>
49 48 
<buildTarget>jar</buildTarget>
50 49 
<stopOnError>false</stopOnError>
51 
<useDefaultCommand>false</useDefaultCommand>
50 
<useDefaultCommand>true</useDefaultCommand>
52 51 
</target>
53 52 
<target name="all" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
54 53 
<buildCommand>nmake</buildCommand>
55 54 
<buildArguments>/f makefile.w32</buildArguments>
56 
<buildTarget>default</buildTarget>
55 
<buildTarget>all</buildTarget>
57 56 
<stopOnError>false</stopOnError>
58 
<useDefaultCommand>false</useDefaultCommand>
57 
<useDefaultCommand>true</useDefaultCommand>
59 58 
</target>
60 59 
<target name="test" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
61 60 
<buildCommand>make</buildCommand>
trunk/libraries/libjni-mrsid/include/es_gva_cit_jmrsid_LTISceneBuffer.h
15 15 
JNIEXPORT jlong JNICALL Java_es_gva_cit_jmrsid_LTISceneBuffer_LTISceneBufferNat
16 16 
  (JNIEnv *, jobject, jlong, jint, jint, jint);
17 17 

  		




  
  18
  
    
/*


  		




  
  19
  
    
 * Class:     es_gva_cit_jmrsid_LTISceneBuffer


  		




  
  20
  
    
 * Method:    LTISceneBuffer1Nat


  		




  
  21
  
    
 * Signature: (JIIIIIII)J


  		




  
  22
  
    
 */


  		




  
  23
  
    
JNIEXPORT jlong JNICALL Java_es_gva_cit_jmrsid_LTISceneBuffer_LTISceneBuffer1Nat


  		




  
  24
  
    
  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jint);


  		




  
  25
  
    

  		




  
  26
  
    
/*


  		




  
  27
  
    
 * Class:     es_gva_cit_jmrsid_LTISceneBuffer


  		




  
  28
  
    
 * Method:    FreeLTISceneBufferNat


  		




  
  29
  
    
 * Signature: (JJ)V


  		




  
  30
  
    
 */


  		




  
  31
  
    
JNIEXPORT void JNICALL Java_es_gva_cit_jmrsid_LTISceneBuffer_FreeLTISceneBufferNat


  		




  
  32
  
    
  (JNIEnv *, jobject, jlong, jlong);


  		




  
  33
  
    

  		




  18
  34
  
    
#ifdef __cplusplus


  		




  19
  35
  
    
}


  		




  20
  36
  
    
#endif


  		












  

    
      trunk/libraries/libjni-mrsid/src/ltiimagestage.cpp
    
  





  106
  106
  
    
  		jvect_byte3 = env->NewByteArray(size);


  		




  107
  107
  
    
  		env->SetByteArrayRegion(jvect_byte3, 0, size,(jbyte *)str_buffer->bufs[2]); 


  		




  108
  108
  
    
	  	env->SetObjectField( objbuf, id_b3, jvect_byte3);


  		




  109
  
  
    
  	


  		




  110
  
  
    
  		delete(str_buffer->membuf);


  		




  111
  
  
    
  		free(str_buffer);


  		




  
  109
  
    
  		


  		




  
  110
  
    
  		//Esto lo haremos en el destructor de LTISceneBuffer


  		




  
  111
  
    
  		//delete(str_buffer->membuf);


  		




  
  112
  
    
  		//free(str_buffer);


  		




  112
  113
  
    
  	}		


  		




  113
  114
  
    
	  	return res;


  		




  114
  115
  
    

  		












  

    
      trunk/libraries/libjni-mrsid/src/ltiscenebuffer.cpp
    
  





  102
  102
  
    
  			//Guardamos el id del buffer en la parte java


  		




  103
  103
  
    
  			


  		




  104
  104
  
    
  			env->SetLongField(obj, id_ptrbuffer, jstructbuf); 


  		




  
  105
  
    
  			


  		




  105
  106
  
    
  		}else


  		




  106
  107
  
    
		  	buffer=new LTISceneBuffer(*pixel,tamx,tamy,NULL);	


  		




  107
  108
  
    
	  	


  		




  ......




  184
  185
  
    
/******************************************************************************/


  		




  185
  186
  
    
  


  		




  186
  187
  
    
JNIEXPORT void JNICALL Java_es_gva_cit_jmrsid_LTISceneBuffer_FreeLTISceneBufferNat


  		




  187
  
  
    
  (JNIEnv *env, jobject obj, jlong cPtr){


  		




  
  188
  
    
  (JNIEnv *env, jobject obj, jlong cPtr_LTISceneBuffer, jlong cPtr_tbuffer){


  		




  188
  189
  
    
  	


  		




  189
  190
  
    
  	LTISceneBuffer *scene = (LTISceneBuffer *) 0 ;


  		




  
  191
  
    
  	t_buffer *datos_ventana;


  		




  190
  192
  
    
  	


  		




  191
  
  
    
  	scene = *(LTISceneBuffer **)&cPtr;


  		




  
  193
  
    
  	scene = *(LTISceneBuffer **)&cPtr_LTISceneBuffer;


  		




  
  194
  
    
  	datos_ventana = *(t_buffer **)&cPtr_tbuffer;


  		




  
  195
  
    
  	


  		




  
  196
  
    
  	//Nos cepillamos el buffer y el objeto scenebuffer para que quede todo aseado


  		




  
  197
  
    
  	


  		




  
  198
  
    
  	if(datos_ventana!=NULL){


  		




  
  199
  
    
	  	if(datos_ventana->membuf!=NULL)delete datos_ventana->membuf;


  		




  
  200
  
    
  		free(datos_ventana);


  		




  
  201
  
    
  	}


  		




  192
  202
  
    
  	if(scene!=NULL){


  		




  193
  203
  
    
  		delete scene;


  		




  194
  204
  
    
  	}


  		












  

    
      trunk/libraries/libjni-mrsid/src/es/gva/cit/jmrsid/LTIPixel.java
    
  





  44
  44
  
    
	 */


  		




  45
  45
  
    
	


  		




  46
  46
  
    
	protected void finalize(){


  		




  
  47
  
    
		System.out.println("Finalizando LTIPixel ..."+cPtr);


  		




  47
  48
  
    
		if(cPtr > 0)


  		




  48
  49
  
    
			FreeLTIPixelNat(cPtr);


  		




  49
  50
  
    
	}


  		












  

    
      trunk/libraries/libjni-mrsid/src/es/gva/cit/jmrsid/LTIImage.java
    
  





  66
  66
  
    
	 */


  		




  67
  67
  
    
	


  		




  68
  68
  
    
	protected void finalize(){


  		




  
  69
  
    
		System.out.println("Finalizando LTIImage ..."+cPtr);


  		




  69
  70
  
    
		if(cPtr > 0)


  		




  70
  71
  
    
			FreeLTIImageNat(cPtr);


  		




  71
  72
  
    
	}


  		












  

    
      trunk/libraries/libjni-mrsid/src/es/gva/cit/jmrsid/LTISceneBuffer.java
    
  





  37
  37
  
    
	


  		




  38
  38
  
    
	private native long LTISceneBufferNat(long pixel,int tamx,int tamy, int flag);


  		




  39
  39
  
    
	private native long LTISceneBuffer1Nat(long pixel, int totalNumCols, int totalNumRows, int colOffset, int rowOffset, int windowNumCols, int windowNumRows, int flag);


  		




  
  40
  
    
	private native void FreeLTISceneBufferNat(long cPtr_LTISceneBuffer, long cPtr_tbuffer);


  		




  40
  41
  
    
	


  		




  41
  42
  
    
	public int size;


  		




  42
  43
  
    
	public byte buf1[];


  		




  ......




  120
  121
  
    
			throw new MrSIDException("Error en el constructor nativo LTIScene.");


  		




  121
  122
  
    
	}


  		




  122
  123
  
    
	


  		




  
  124
  
    
	/**


  		




  
  125
  
    
	 * Destructor 


  		




  
  126
  
    
	 */


  		




  123
  127
  
    
	


  		




  
  128
  
    
	public void finalize(){


  		




  
  129
  
    
		System.out.println("Finalizando LTIsceneBuffer ..."+cPtrbuffer);


  		




  
  130
  
    
		if(cPtr > 0)


  		




  
  131
  
    
			FreeLTISceneBufferNat(cPtr, cPtrbuffer);


  		




  
  132
  
    
	}


  		




  124
  133
  
    
	


  		




  125
  134
  
    
}


  		












  

    
      trunk/libraries/libjni-mrsid/src/es/gva/cit/jmrsid/LTIScene.java
    
  





  54
  54
  
    
	 * Destructor 


  		




  55
  55
  
    
	 */


  		




  56
  56
  
    
	


  		




  57
  
  
    
	protected void finalize(){


  		




  
  57
  
    
	public void finalize(){


  		




  
  58
  
    
		System.out.println("Finalizando LTIscene ..."+cPtr);


  		




  58
  59
  
    
		if(cPtr > 0)


  		




  59
  60
  
    
			FreeLTISceneNat(cPtr);


  		




  60
  61
  
    
	}


  		












  

    
      trunk/libraries/libjni-mrsid/src/es/gva/cit/jmrsid/LTIMetadataDatabase.java
    
  





  57
  57
  
    
	 */


  		




  58
  58
  
    
	


  		




  59
  59
  
    
	protected void finalize(){


  		




  
  60
  
    
		System.out.println("Finalizando LTIMetadataDatabase ..."+cPtr);


  		




  
  61
  
    
		


  		




  60
  62
  
    
		if(cPtr > 0)


  		




  61
  63
  
    
			FreeLTIMetadataDatabaseNat(cPtr);


  		




  62
  64
  
    
	}


  		












  

    
      trunk/libraries/libjni-mrsid/src/ltimetadatarecord.cpp
    
  





  419
  419
  
    
  		const lt_uint32* dims = record->getDims();


  		




  420
  420
  
    
  		const lt_uint32 numdims = record->getNumDims();


  		




  421
  421
  
    
  		longitudes = env->NewIntArray((int)numdims);


  		




  422
  
  
    
  		env->SetIntArrayRegion( longitudes, 0, (int)numdims,(const jint *)dims); 


  		




  
  422
  
    
  		env->SetIntArrayRegion( longitudes, 0, (int)numdims,(jint *)dims); 


  		




  423
  423
  
    

  		




  424
  424
  
    
  	}


  		




  425
  425
  
    
  	return longitudes;


  		












Also available in:  Unified diff