Changeset 14320

Show
Ignore:
Timestamp:
04/18/08 14:02:57 (3 months ago)
Author:
warmerdam
Message:

removed colortable from java bindings for now (#2231)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.5/gdal/swig/include/gdal.i

    r13049 r14320  
    259259// 
    260260//************************************************************************ 
    261 #ifndef SWIGPERL 
     261#if !defined(SWIGPERL) && !defined(SWIGJAVA) 
    262262%rename (ColorEntry) GDALColorEntry; 
    263263typedef struct 
    …… 
    445445// 
    446446//************************************************************************ 
     447#if !defined(SWIGJAVA) 
    447448%include "ColorTable.i" 
     449#endif 
    448450 
    449451//************************************************************************ 

  • branches/1.5/gdal/swig/java/apps/gdalinfo.java

    r9112 r14320  
    77 * Author:   Benjamin Collins, The MITRE Corporation 
    88 * 
     9 * **************************************************************************** 
     10 * Copyright (c) 1998, Frank Warmerdam 
     11 * Copyright (c) 2006, The MITRE Corporation 
    912 * 
    10  * $Log$ 
    11  * Revision 1.1  2006/02/02 21:04:35  collinsb 
    12  * Expand support for SWIG Java bindings 
     13 * Permission is hereby granted, free of charge, to any person obtaining a 
     14 * copy of this software and associated documentation files (the "Software"), 
     15 * to deal in the Software without restriction, including without limitation 
     16 * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
     17 * and/or sell copies of the Software, and to permit persons to whom the 
     18 * Software is furnished to do so, subject to the following conditions: 
    1319 * 
     20 * The above copyright notice and this permission notice shall be included 
     21 * in all copies or substantial portions of the Software. 
    1422 * 
    15  * 
    16 */ 
     23 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
     24 * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
     25 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
     26 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
     27 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
     28 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
     29 * DEALINGS IN THE SOFTWARE. 
     30 ****************************************************************************/ 
     31 
    1732 
    1833import java.util.Enumeration; 
    …… 
    2136 
    2237import org.gdal.gdal.Band; 
    23 import org.gdal.gdal.ColorTable; 
     38//import org.gdal.gdal.ColorTable; 
    2439import org.gdal.gdal.Dataset; 
    2540import org.gdal.gdal.Driver; 
    …… 
    238253                                Double[] pass1 = new Double[1], pass2 = new Double[1]; 
    239254                                double[] adfCMinMax = new double[2]; 
    240                               ColorTable hTable; 
     255//                            ColorTable hTable; 
    241256 
    242257                                hBand = hDataset.GetRasterBand(iBand + 1); 
    …… 
    346361                                 } 
    347362 
     363/** ColorTable not supported in GDAL 1.5 and 1.6.  
     364 
    348365                                if (hBand.GetRasterColorInterpretation() == gdalconstConstants.GCI_PaletteIndex 
    349366                                                && (hTable = hBand.GetRasterColorTable()) != null) { 
    …… 
    360377                                        } 
    361378                                } 
     379**/ 
    362380                        } 
    363381 
    364382                        hDataset.delete(); 
    365383 
    366                         //CSLDestroy( argv ); 
    367  
    368                         //GDALDumpOpenDatasets( stderr ); 
    369  
    370384                        //gdal.DestroyDriverManager(); 
    371  
    372                         //CPLDumpSharedList( null ); 
    373                         //CPLCleanupTLS(); 
    374385 
    375386                        System.exit(0);