Changeset 13793

Show
Ignore:
Timestamp:
02/15/08 13:41:09 (5 months ago)
Author:
dron
Message:

Andrey Kiselev's e-mail fixed; avoid warnings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/frmts/mrsid/mrsiddataset.cpp

    r13715 r13793  
    44 * Project:  Multi-resolution Seamless Image Database (MrSID) 
    55 * Purpose:  Read/write LizardTech's MrSID file format - Version 4+ SDK. 
    6  * Author:   Andrey Kiselev, dron@remotesensing.org 
     6 * Author:   Andrey Kiselev, dron@ak4719.spb.edu 
    77 * 
    88 ****************************************************************************** 
    9  * Copyright (c) 2003, Andrey Kiselev <dron@remotesensing.org> 
     9 * Copyright (c) 2003, Andrey Kiselev <dron@ak4719.spb.edu> 
    1010 * 
    1111 * Permission is hereby granted, free of charge, to any person obtaining a 
    …… 
    12551255#ifdef MRSID_J2K 
    12561256    if ( bIsJP2 ) 
    1257         poDS->poImageReader = new LTIDLLReader<J2KImageReader>( oFileSpec, true ); 
     1257    { 
     1258        poDS->poImageReader = 
     1259            new LTIDLLReader<J2KImageReader>( oFileSpec, true ); 
     1260    } 
    12581261    else 
    12591262#endif 
    1260         poDS->poImageReader = new LTIDLLReader<MrSIDImageReader>( oFileSpec, false ); 
     1263    { 
     1264        poDS->poImageReader = 
     1265            new LTIDLLReader<MrSIDImageReader>( oFileSpec, false ); 
     1266    } 
    12611267 
    12621268    if ( !LT_SUCCESS( poDS->poImageReader->initialize() ) ) 
    …… 
    15701576} 
    15711577 
    1572 static char *papszDatumEquiv[] = 
     1578static const char *papszDatumEquiv[] = 
    15731579{ 
    15741580    "Militar_Geographische_Institut", 
    …… 
    23442350    if( psDefn->Model == ModelTypeProjected ) 
    23452351    { 
    2346         char    *pszPCSName = "unnamed"; 
    2347         int         bNeedFree = FALSE; 
     2352        char    *pszPCSName; 
     2353        int     bPCSNameSet = FALSE; 
    23482354 
    23492355        if( psDefn->PCS != KvUserDefined ) 
    …… 
    23512357 
    23522358            if( GTIFGetPCSInfo( psDefn->PCS, &pszPCSName, NULL, NULL, NULL ) ) 
    2353                 bNeedFree = TRUE; 
     2359                bPCSNameSet = TRUE; 
    23542360             
    2355             oSRS.SetNode( "PROJCS", pszPCSName ); 
    2356             if( bNeedFree ) 
     2361            oSRS.SetNode( "PROJCS", bPCSNameSet ? pszPCSName : "unnamed" ); 
     2362            if( bPCSNameSet ) 
    23572363                GTIFFreeMemory( pszPCSName ); 
    23582364