Revision 1066

View differences:

trunk/libraries/libjni-gdal/.cdtproject
41 41
<buildArguments>/f makefile.w32</buildArguments>
42 42
<buildTarget>clean</buildTarget>
43 43
<stopOnError>false</stopOnError>
44
<useDefaultCommand>false</useDefaultCommand>
44
<useDefaultCommand>true</useDefaultCommand>
45 45
</target>
46 46
<target name="jar" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
47 47
<buildCommand>nmake</buildCommand>
trunk/libraries/libjni-gdal/include/es_gva_cit_jogr_OGRSpatialReference.h
63 63
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRSpatialReference_getHemisphereNat
64 64
  (JNIEnv *, jobject, jlong);
65 65

  
66
/*
67
 * Class:     es_gva_cit_jogr_OGRSpatialReference
68
 * Method:    setFromUserInputNat
69
 * Signature: (JLjava/lang/String;)I
70
 */
71
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRSpatialReference_setFromUserInputNat
72
  (JNIEnv *, jobject, jlong, jstring);
73

  
66 74
#ifdef __cplusplus
67 75
}
68 76
#endif
trunk/libraries/libjni-gdal/include/es_gva_cit_jogr_OGRLayer.h
210 210
/*
211 211
 * Class:     es_gva_cit_jogr_OGRLayer
212 212
 * Method:    startTransactionNat
213
 * Signature: (J)V
213
 * Signature: (J)I
214 214
 */
215
JNIEXPORT void JNICALL Java_es_gva_cit_jogr_OGRLayer_startTransactionNat
215
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_startTransactionNat
216 216
  (JNIEnv *, jobject, jlong);
217 217

  
218 218
#ifdef __cplusplus
trunk/libraries/libjni-gdal/src/es/gva/cit/jogr/OGRPolygon.java
36 36
 */
37 37

  
38 38

  
39
public class OGRPolygon extends JNIBase{
39
public class OGRPolygon extends OGRSurface{
40 40
	
41 41
	private native void FreeOGRPolygonNat(long cPtr);
42 42
	private native String getGeometryNameNat( long cPtr );
......
60 60
	private native OGRLinearRing getInteriorRingNat( long cPtr,  int i );
61 61
	private native void closeRingsNat( long cPtr );
62 62
	
63
	public OGRPolygon(){}		
63 64
	/**
64 65
	 * Constructor
65 66
	 * @param cPtr	direcci?n de memoria al objeto OGRPolygon de C. 
66 67
	 */
67 68
		
68 69
	public OGRPolygon(long cPtr){
69
		this.cPtr=cPtr;
70
		super(cPtr);
70 71
	}		
71 72
		
72 73
	/**
trunk/libraries/libjni-gdal/src/es/gva/cit/jogr/OGRLinearRing.java
35 35
 * @link http://www.gvsig.gva.es
36 36
 */
37 37

  
38
public class OGRLinearRing extends JNIBase{
38
public class OGRLinearRing extends OGRLineString{
39 39
	
40 40
	private native void FreeOGRLinearRingNat(long cPtr);
41 41
	private native String getGeometryNameNat(long cPtr);
......
46 46
	private native int exportToWkbNat( long cPtr, boolean wktborder, String wkt ); //return OGRErr. boolean=OGRwkbByteOrder
47 47
																
48 48
	
49
	public OGRLinearRing(){}
49 50
	/**
50 51
	 * Constructor
51 52
	 * @param cPtr	direcci?n de memoria al objeto OGRLinearRing de C. 
52 53
	 */
53 54
		
54 55
	public OGRLinearRing(long cPtr){
55
		this.cPtr=cPtr;
56
		super(cPtr);
56 57
	}		
57 58
		
58 59
	/**
trunk/libraries/libjni-gdal/src/es/gva/cit/jogr/OGRGeometry.java
74 74
    private native long symmetricDifferenceNat( long cPtr,  OGRGeometry geom );
75 75

  
76 76
	
77
    public OGRGeometry(){}
77 78
	/**
78 79
	 * Constructor
79 80
	 * @param cPtr	direcci?n de memoria al objeto OGRGeometry de C. 
trunk/libraries/libjni-gdal/src/es/gva/cit/jogr/OGRLayer.java
63 63
	private native int rollbackTransactionNat(long cPtr);
64 64
	private native int referenceNat(long cPtr);
65 65
	private native int dereferenceNat(long cPtr);
66
	private native void startTransactionNat(long cPtr);
66
	private native int startTransactionNat(long cPtr);
67 67

  
68 68
	/**
69 69
	 * Constructor
......
398 398
	 	if(cPtr <= 0)
399 399
			throw new OGRException("Error en startTransaction(). El constructor no tuvo exito");
400 400
	 	
401
	 	startTransactionNat(cPtr);
401
	 	int ogrerr = startTransactionNat(cPtr);
402
	 	lanzarExcepcion(ogrerr,"Error en startTransaction().");
402 403
	 }
403 404

  
404 405
	 /**
trunk/libraries/libjni-gdal/src/es/gva/cit/jogr/OGRLineString.java
66 66
    private native void addPointNat( long cPtr,  OGRPoint point );
67 67
    private native void addPointNat( long cPtr,  double x, double y, double z );
68 68
	
69
    public OGRLineString(){}
70
    
69 71
	/**
70 72
	 * Constructor
71 73
	 * @param cPtr	direcci?n de memoria al objeto OGRLineString de C. 
trunk/libraries/libjni-gdal/src/es/gva/cit/jogr/OGRSFDriver.java
38 38
	
39 39
	public native String getNameNat(long cPtr);
40 40
	private native long openNat( long cPtr, String pszName, boolean bUpdate );
41
	private native int testCapabilityNat( long cPtr,String od );
41
	private native int testCapabilityNat( long cPtr,String cap );
42 42
	private native long createDataSourceNat( long cPtr, String pszName);                                             
43 43
    private native int deleteDataSourceNat( long cPtr,String pszName );//Excepciones
44 44
    private native long copyDataSourceNat( long cPtr, 
......
87 87
	}
88 88

  
89 89
	/**
90
	 * 
90
	 * @param capability	Capacidad del driver a testear
91
	 * <UL>
92
	 *   <LI>"RandomRead"</LI>
93
     *	 <LI>"SequentialWrite"</LI>
94
     *   <LI>"RandomWrite"</LI>
95
     *   <LI>"FastSpatialFilter"</LI>
96
     *   <LI>"FastFeatureCount"</LI>
97
     *   <LI>"FastGetExtent"</LI>
98
     *   <LI>"CreateField"</LI>
99
     *   <LI>"Transactions"</LI>
100
     *   <LI>"DeleteFeature"</LI>
101
     *   <LI>"CreateLayer"</LI>
102
     *   <LI>"DeleteLayer"</LI>
103
     *   <LI>"CreateDataSource"</LI>
104
     *   <LI>"DeleteDataSource"</LI>
105
     * </UL>
91 106
	 */
92 107
	
93
	public boolean testCapability( String od )throws OGRException{
108
	public boolean testCapability( String capability )throws OGRException{
94 109
		
95 110
		if(cPtr <= 0)
96 111
			throw new OGRException("Error en testCapability(). El constructor ha fallado.");
97 112
		 
98 113
		int res=-1;
99
		res = testCapabilityNat(cPtr, od);
114
		res = testCapabilityNat(cPtr, capability);
100 115
		
101 116
		if(res<0)
102 117
			throw new OGRException("Error en testCapability(). No se ha podido obtener un valor de retorno valido.");
103

  
118
		
104 119
		if(res>=1)return true;
105 120
		return false;
106 121
	}
trunk/libraries/libjni-gdal/src/es/gva/cit/jogr/OGRSurface.java
1
/**********************************************************************
2
 * $Id$
3
 *
4
 * Name:     OGRSurface.java
5
 * Project:  JGDAL. Interface java to OGR (Frank Warmerdam).
6
 * Purpose:   
7
 * Author:   Nacho Brodin, brodin_ign@gva.es
8
 *
9
 **********************************************************************/
10
/*Copyright (C) 2004  Nacho Brodin <brodin_ign@gva.es>
11

  
12
 This program is free software; you can redistribute it and/or
13
 modify it under the terms of the GNU General Public License
14
 as published by the Free Software Foundation; either version 2
15
 of the License, or (at your option) any later version.
16

  
17
 This program is distributed in the hope that it will be useful,
18
 but WITHOUT ANY WARRANTY; without even the implied warranty of
19
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
20
 GNU General Public License for more details.
21

  
22
 You should have received a copy of the GNU General Public License
23
 along with this program; if not, write to the Free Software
24
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
25
 */
26

  
27
package es.gva.cit.jogr;
28

  
29

  
30
/** 
31
 * 
32
 * @author Nacho Brodin <brodin_ign@gva.es>.<BR> Equipo de desarrollo gvSIG.<BR> http://www.gvsig.gva.es
33
 * @version 0.0
34
 * @link http://www.gvsig.gva.es
35
 */
36

  
37
public class OGRSurface extends OGRGeometry{
38
	
39
	private native void FreeOGRSurface( long cPtr );
40
	
41
	public OGRSurface(){}
42
	
43
	/**
44
	 * Constructor
45
	 * @param cPtr	direcci?n de memoria al objeto OGRSurface de C. 
46
	 */
47
	
48
	public OGRSurface(long cPtr){
49
		super(cPtr);
50
	}
51
	
52
	/**
53
	 * Destructor 
54
	 */
55
	
56
	protected void finalize(){
57
		if(cPtr > 0)
58
			FreeOGRSurface(cPtr);
59
	}
60
}
0 61

  
trunk/libraries/libjni-gdal/src/es/gva/cit/jogr/OGRSpatialReference.java
49 49
	private native void OSRDestroySpatialReferenceNat(long cPtr);
50 50
	private native int getUTMZoneNat(long cPtr);
51 51
	private native int getHemisphereNat(long cPtr);
52
	private native int setFromUserInputNat(long cPtr, String a_srs);
52 53
	
53 54
	/**
54 55
	 *Constructor a partir de la direcci?n de memoria 
......
76 77
	public void setUTM(int zona, boolean norte_sur)throws OGRException{
77 78
		
78 79
		if(cPtr <= 0)
79
			throw new OGRException("Error en setUTM(). La llamada GDALOpen no tuvo exito");
80
			throw new OGRException("Error en setUTM(). La llamada de creaci?n de objeto no tuvo exito");
80 81
		
81 82
		int ns=-1;
82 83
		if(norte_sur)ns=1;
......
97 98
	public int getUTMZone()throws OGRException{
98 99
		
99 100
		if(cPtr <= 0)
100
			throw new OGRException("Error en getUTMZone(). La llamada GDALOpen no tuvo exito");
101
			throw new OGRException("Error en getUTMZone(). La llamada de creaci?n de objeto no tuvo exito");
101 102
		
102 103
		int res = getUTMZoneNat(cPtr);
103 104
		
......
116 117
	public boolean getHemisphere()throws OGRException{
117 118
		
118 119
		if(cPtr <= 0)
119
			throw new OGRException("Error en getHemisphere(). La llamada GDALOpen no tuvo exito");
120
			throw new OGRException("Error en getHemisphere(). La llamada de creaci?n de objeto no tuvo exito");
120 121
		
121 122
		int hemis = getHemisphereNat(cPtr);
122 123
		 			
......
143 144
	public void setWellKnownGeogCS( String cs)throws OGRException{
144 145
		
145 146
		if(cPtr <= 0)
146
			throw new OGRException("Error en setWellKnownGeogCS(). La llamada GDALOpen no tuvo exito");
147
			throw new OGRException("Error en setWellKnownGeogCS(). La llamada de creaci?n de objeto no tuvo exito");
147 148
		
148 149
		int res = setWellKnownGeogCSNat(cPtr, cs);
149 150
		
......
159 160
	public String exportToWkt()throws OGRException{
160 161
		
161 162
		if(cPtr <= 0)
162
			throw new OGRException("Error en exportToWkt(). La llamada GDALOpen no tuvo exito");
163
			throw new OGRException("Error en exportToWkt(). La llamada de creaci?n de objeto no tuvo exito");
163 164
		
164 165
		String wkt = exportToWktNat(cPtr);
165 166
		
......
169 170
		return wkt;
170 171
	}
171 172
	
173
	
172 174
	/**
175
	 * @throws OGRException
176
	 * @param a_srs	
177
	 */
178
	
179
	public void setFromUserInput(String a_srs)throws OGRException{
180
		
181
		if(cPtr <= 0)
182
			throw new OGRException("Error en setFromUserInput(). La llamada de creaci?n de objeto no tuvo exito");
183
		
184
		int ogrerr = setFromUserInputNat(cPtr,a_srs);
185
		lanzarExcepcion(ogrerr,"Error en setFromUserInput().");
186

  
187
	}
188
	
189
	
190
	/**
173 191
	 * Destructor 
174 192
	 */
175 193
	
trunk/libraries/libjni-gdal/src/ogrlayer_interfaz.cpp
153 153
/******************************************************************************/
154 154
JNIEXPORT jlong JNICALL Java_es_gva_cit_jogr_OGRLayer_getSpatialFilterNat
155 155
  (JNIEnv *env, jobject obj, jlong cPtr){
156
  	  	return 0;
156
  	
157
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
158
  	  	OGRGeometry 	*geom;
159
  	  	long 			ptro_geom = -1;
160
  	
161
	  	df = *(OGRLayer **)&cPtr;
162
		geom = df->GetSpatialFilter();
163
		
164
		if(geom!=NULL)
165
			ptro_geom = (long)&(*geom);
166
		
167
  	  	return ptro_geom;
157 168
  }
158 169

  
159 170
/******************************************************************************/
......
161 172
/******************************************************************************/
162 173
JNIEXPORT void JNICALL Java_es_gva_cit_jogr_OGRLayer_setSpatialFilterNat
163 174
  (JNIEnv *env, jobject obj, jlong cPtr, jlong ptr_geom){
175
  	
176
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
177
  		OGRGeometry		*geom;
178
  		
179
	  	df = *(OGRLayer **)&cPtr;
180
	  	geom = *(OGRGeometry **)&ptr_geom;
181
	  	
182
	  	df->SetSpatialFilter(geom);
183
	  		  	
164 184
  }
165 185

  
166 186
/******************************************************************************/
......
168 188
/******************************************************************************/
169 189
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_setAttributeFilterNat
170 190
  (JNIEnv *env, jobject obj, jlong cPtr, jstring attr){
171
  	  	return 0;
191
  		
192
  	  	OGRLayer *df = (OGRLayer *) 0 ;
193
  		const char *attrib;
194
  		int ogrerr;
195
  		
196
	  	df = *(OGRLayer **)&cPtr;
197
	  	attrib = env->GetStringUTFChars( attr, 0);
198
	  	ogrerr = df->SetAttributeFilter(attrib);
199
	  	env->ReleaseStringUTFChars( attr, attrib);
200
	  	
201
  	  	return ogrerr;
172 202
  }
173 203

  
174 204
/******************************************************************************/
......
176 206
/******************************************************************************/
177 207
JNIEXPORT jlong JNICALL Java_es_gva_cit_jogr_OGRLayer_getFeatureNat
178 208
  (JNIEnv *env, jobject obj, jlong cPtr, jlong nFID){
179
  	  	return 0;
209
  		
210
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
211
  		OGRFeature 		*feat;
212
  		long			ptro_feat=-1;
213
  		
214
	  	df = *(OGRLayer **)&cPtr;
215
	  	feat = df->GetFeature(nFID);
216
	  	if(feat!=NULL)
217
			ptro_feat = (long)&(*feat);
218
	  	
219
  	  	return ptro_feat;
180 220
  }
181 221

  
182 222
/******************************************************************************/
......
184 224
/******************************************************************************/
185 225
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_setFeatureNat
186 226
  (JNIEnv *env, jobject obj, jlong cPtr, jlong poFeature){
187
  	  	return 0;
227
  	  	  		
228
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
229
  		OGRFeature		*feat;
230
  		int				ogrerr=-1;
231
  		
232
	  	df = *(OGRLayer **)&cPtr;
233
	  	feat = *(OGRFeature **)&poFeature;
234
	  	ogrerr = df->SetFeature(feat);
235
	  	
236
  	  	return ogrerr;
188 237
  }
189 238
  
190 239

  
......
193 242
/******************************************************************************/
194 243
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_createFeatureNat
195 244
  (JNIEnv *env, jobject obj, jlong cPtr, jlong poFeature){
196
  	  	return 0;
245
  		
246
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
247
  		OGRFeature		*feat;
248
  		int				ogrerr=-1;
249
  		
250
	  	df = *(OGRLayer **)&cPtr;
251
	  	feat = *(OGRFeature **)&poFeature;
252
	  	ogrerr = df->CreateFeature(feat);
253
	  	
254
  	  	return ogrerr;
197 255
  }
198 256

  
199 257
/******************************************************************************/
......
201 259
/******************************************************************************/
202 260
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_deleteFeatureNat
203 261
  (JNIEnv *env, jobject obj, jlong cPtr, jlong nFID){
204
  	  	return 0;
262
  		
263
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
264
  		int				ogrerr=-1;
265
  	
266
	  	df = *(OGRLayer **)&cPtr;
267
		ogrerr = df->DeleteFeature(nFID);
268
  	  	return ogrerr;
205 269
  }
206 270

  
207 271
/******************************************************************************/
......
209 273
/******************************************************************************/
210 274
JNIEXPORT jlong JNICALL Java_es_gva_cit_jogr_OGRLayer_getSpatialRefNat
211 275
  (JNIEnv *env, jobject obj, jlong cPtr){
212
  	  	return 0;
276
  		
277
  	  	OGRLayer 				*df = (OGRLayer *) 0 ;
278
  		OGRSpatialReference		*sr;
279
  		long 					ptro_sr = -1;
280
  		
281
	  	df = *(OGRLayer **)&cPtr;
282
	  	sr = df->GetSpatialRef();
283
	  	if(sr!=NULL)
284
			ptro_sr = (long)&(*sr);
285
			
286
  	  	return ptro_sr;
213 287
  }
214 288

  
215 289
/******************************************************************************/
......
217 291
/******************************************************************************/
218 292
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_testCapabilityNat
219 293
  (JNIEnv *env, jobject obj, jlong cPtr, jstring od){
220
  	  	return 0;
294
  		
295
  	  	OGRLayer 	*df = (OGRLayer *) 0 ;
296
  		int 		res=-1;
297
  		const char *s;
298
  		
299
	  	df = *(OGRLayer **)&cPtr;
300
	  	s = env->GetStringUTFChars( od, 0);
301
	  	res = df->TestCapability(s);
302
	  	env->ReleaseStringUTFChars( od, s);
303
  	  	return res;
221 304
  }
222 305

  
223 306
/******************************************************************************/
......
225 308
/******************************************************************************/
226 309
JNIEXPORT jstring JNICALL Java_es_gva_cit_jogr_OGRLayer_getInfoNat
227 310
  (JNIEnv *env, jobject obj, jlong cPtr, jstring s){
228
  	return NULL;
311
  		
312
  	  	OGRLayer 	*df = (OGRLayer *) 0 ;
313
  	  	const char 	*par;
314
  	  	const char 	*res;
315
  		jstring		cadena;
316
  		
317
	  	df = *(OGRLayer **)&cPtr;
318
	  	par = env->GetStringUTFChars( s, 0);
319
	  	res = df->GetInfo(par);
320
	  	env->ReleaseStringUTFChars( s, par);
321
	  	cadena = env->NewStringUTF(res); 
322
	  	
323
  		return cadena;
229 324
  }
230 325

  
231 326
/******************************************************************************/
......
233 328
/******************************************************************************/
234 329
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_createFieldNat
235 330
  (JNIEnv *env, jobject obj, jlong cPtr, jlong poField, jint bAproxOk){
236
  	  	return 0;
331
  		
332
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
333
  		OGRFieldDefn	*field;
334
  		int				ogrerr;
335
  		
336
	  	df = *(OGRLayer **)&cPtr;
337
	  	field = *(OGRFieldDefn **)&poField;
338
		ogrerr = df->CreateField(field, bAproxOk);
339
	  	
340
  	  	return ogrerr;
237 341
  }
238 342

  
239 343
/******************************************************************************/
......
241 345
/******************************************************************************/
242 346
JNIEXPORT jlong JNICALL Java_es_gva_cit_jogr_OGRLayer_getStyleTableNat
243 347
  (JNIEnv *env, jobject obj, jlong cPtr){
244
  	  	return 0;
348
  		
349
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
350
  		OGRStyleTable	*style;
351
  		long			ptro_style = -1;
352
  		
353
	  	df = *(OGRLayer **)&cPtr;
354
	  	style = df->GetStyleTable();
355
	  	if(style!=NULL)
356
			ptro_style = (long)&(*style);
357
	  	
358
  	  	return ptro_style;
245 359
  }
246 360

  
247 361
/******************************************************************************/
......
249 363
/******************************************************************************/
250 364
JNIEXPORT void JNICALL Java_es_gva_cit_jogr_OGRLayer_setStyleTableNat
251 365
  (JNIEnv *env, jobject obj, jlong cPtr, jlong poStyleTable){
366
  		
367
  	  	OGRLayer 		*df = (OGRLayer *) 0 ;
368
  		OGRStyleTable	*styletable;
369
  		
370
	  	df = *(OGRLayer **)&cPtr;
371
	  	styletable = *(OGRStyleTable **)&poStyleTable;
372
	  	
373
	  	df->SetStyleTable(styletable);
252 374
  }
253 375

  
254 376
/******************************************************************************/
......
256 378
/******************************************************************************/
257 379
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_initializeIndexSupportNat
258 380
  (JNIEnv *env, jobject obj, jlong cPtr, jstring s){
259
  	  	return 0;
381
  		
382
  	  	OGRLayer 	*df = (OGRLayer *) 0 ;
383
  	  	int			ogrerr;
384
  	  	const char	*par;
385
  	  		  	
386
	  	df = *(OGRLayer **)&cPtr;
387
	  	par = env->GetStringUTFChars( s, 0);
388
	  	ogrerr = df->InitializeIndexSupport(par);
389
	  	env->ReleaseStringUTFChars( s, par);
390
	  
391
  	  	return ogrerr;
260 392
  }
261 393

  
262 394
/******************************************************************************/
......
264 396
/******************************************************************************/
265 397
JNIEXPORT jlong JNICALL Java_es_gva_cit_jogr_OGRLayer_getIndexNat
266 398
  (JNIEnv *env, jobject obj, jlong cPtr){
267
  	  	return 0;
399
  		
400
  	  	OGRLayer 			*df = (OGRLayer *) 0 ;
401
  		OGRLayerAttrIndex	*layerattrindex;
402
  		long				ptro_layerattr = -1;
403
  		
404
	  	df = *(OGRLayer **)&cPtr;
405
	  	layerattrindex = df->GetIndex();
406
	  	if(layerattrindex!=NULL)
407
			ptro_layerattr = (long)&(*layerattrindex);
408
	  	
409
  	  	return ptro_layerattr;
268 410
  }
269 411

  
270 412
/******************************************************************************/
......
272 414
/******************************************************************************/
273 415
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_syncToDiskNat
274 416
  (JNIEnv *env, jobject obj, jlong cPtr){
275
  	  	return 0;
417
  		
418
  	  	OGRLayer 	*df = (OGRLayer *) 0 ;
419
  		int 		ogrerr;
420
  		
421
		df = *(OGRLayer **)&cPtr;
422
	  	ogrerr = df->SyncToDisk();
423
  	  	return ogrerr;
276 424
  }
277 425

  
278 426
/******************************************************************************/
......
280 428
/******************************************************************************/
281 429
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_commitTransactionNat
282 430
  (JNIEnv *env, jobject obj, jlong cPtr){
283
  	  	return 0;
431
  		
432
  	  	OGRLayer *df = (OGRLayer *) 0 ;
433
	  	int 		ogrerr;
434
	  	
435
	  	df = *(OGRLayer **)&cPtr;
436
	  	ogrerr = df->CommitTransaction();
437
	  	
438
  	  	return ogrerr;
284 439
  }
285 440

  
286 441
/******************************************************************************/
......
288 443
/******************************************************************************/
289 444
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_rollbackTransactionNat
290 445
  (JNIEnv *env, jobject obj, jlong cPtr){
291
  	  	return 0;
446
  		
447
  	  	OGRLayer 	*df = (OGRLayer *) 0 ;
448
  	  	int			ogrerr;
449
  	
450
	  	df = *(OGRLayer **)&cPtr;
451
	  	ogrerr = df->RollbackTransaction();
452
  	  	return ogrerr;
453
  	  	
292 454
  }
293 455

  
294 456
/******************************************************************************/
......
296 458
/******************************************************************************/
297 459
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_referenceNat
298 460
  (JNIEnv *env, jobject obj, jlong cPtr){
299
  	  	return 0;
461
  		
462
  	  	OGRLayer 	*df = (OGRLayer *) 0 ;
463
  	  	int			res;
464
  	  	
465
	  	df = *(OGRLayer **)&cPtr;
466
	  	res = df->Reference();
467
  	  	return res;
468
  	  	
300 469
  }
301 470

  
302 471
/******************************************************************************/
......
304 473
/******************************************************************************/
305 474
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_dereferenceNat
306 475
  (JNIEnv *env, jobject obj, jlong cPtr){
307
  	return 0;
476
  		
477
  	  	OGRLayer 	*df = (OGRLayer *) 0 ;
478
  		int 		res;
479
  		
480
	  	df = *(OGRLayer **)&cPtr;
481
	  	res = df->Dereference();
482
  		return res;
308 483
  }
309 484

  
310 485
/******************************************************************************/
311 486
//								startTransaction
312 487
/******************************************************************************/
313
JNIEXPORT void JNICALL Java_es_gva_cit_jogr_OGRLayer_startTransactionNat
488
JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRLayer_startTransactionNat
314 489
  (JNIEnv *env, jobject obj, jlong cPtr){
490
  		
491
  	  	OGRLayer 	*df = (OGRLayer *) 0 ;
492
  		int 		ogrerr;
493
  		
494
	  	df = *(OGRLayer **)&cPtr;
495
		ogrerr = df->StartTransaction();
496
		return ogrerr;
315 497
  }
316 498
  
trunk/libraries/libjni-gdal/src/ogrspatialreference_interfaz.c
167 167
  	}
168 168
  }
169 169

  
170
  
170
/******************************************************************************/
171
//							setFromUserInput
172
/******************************************************************************/  
173
 
174
 JNIEXPORT jint JNICALL Java_es_gva_cit_jogr_OGRSpatialReference_setFromUserInputNat
175
  (JNIEnv *env, jobject obj, jlong cPtr, jstring a_srs){
176
  	
177
  	int						ogrerr;
178
  	OGRSpatialReferenceH 	*hSRS = (OGRSpatialReferenceH *) 0 ;
179
  	
180
  	hSRS = *(OGRSpatialReferenceH **)&cPtr;
181
  	const char *s = (*env)->GetStringUTFChars(env, a_srs, 0);
182
  	ogrerr = OSRSetFromUserInput(hSRS,s);
183
  	(*env)->ReleaseStringUTFChars(env, a_srs, s);
184
  	return ogrerr;
185
  	
186
  }

Also available in: Unified diff