Navigation

← Previous Changeset
Next Changeset →

Changeset 12686

Timestamp:

11/09/07 14:31:29 (10 months ago)

Author:

warmerdam

Message:

replace CPLSPrintf with CPLString (#1979)

Files:

trunk/gdal/alg/gdal_tps.cpp (modified) (2 diffs)
trunk/gdal/alg/gdalgeoloc.cpp (modified) (1 diff)
trunk/gdal/alg/gdaltransformer.cpp (modified) (1 diff)
trunk/gdal/alg/gdalwarper.cpp (modified) (3 diffs)
trunk/gdal/frmts/gtiff/geotiff.cpp (modified) (1 diff)
trunk/gdal/frmts/jp2kak/jp2kakdataset.cpp (modified) (2 diffs)
trunk/gdal/frmts/mrsid/mrsiddataset.cpp (modified) (2 diffs)
trunk/gdal/frmts/nitf/nitfdataset.cpp (modified) (8 diffs)
trunk/gdal/ogr/ogr_srs_panorama.cpp (modified) (2 diffs)
trunk/gdal/ogr/ogr_srs_pci.cpp (modified) (1 diff)
trunk/gdal/ogr/ogr_srs_usgs.cpp (modified) (4 diffs)
trunk/gdal/ogr/ogr_srs_xml.cpp (modified) (2 diffs)
trunk/gdal/ogr/ogrfeaturestyle.cpp (modified) (10 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/gdal/alg/gdal_tps.cpp

r11880	r12686
249	249	CPLCreateXMLElementAndValue(
250	250	psTree, "Reversed",
251		CPLSPrintf( "%d", psInfo->bReversed ) );
	251	CPLString().Printf( "%d", psInfo->bReversed ) );
252	252
253	253	/* -------------------------------------------------------------------- */
…	…
273	273
274	274	CPLSetXMLValue( psXMLGCP, "#Pixel",
275		CPLSPrintf( "%.4f", psGCP->dfGCPPixel ) );
	275	CPLString().Printf( "%.4f", psGCP->dfGCPPixel ) );
276	276
277	277	CPLSetXMLValue( psXMLGCP, "#Line",
278		CPLSPrintf( "%.4f", psGCP->dfGCPLine ) );
	278	CPLString().Printf( "%.4f", psGCP->dfGCPLine ) );
279	279
280	280	CPLSetXMLValue( psXMLGCP, "#X",
281		CPLSPrintf( "%.12E", psGCP->dfGCPX ) );
	281	CPLString().Printf( "%.12E", psGCP->dfGCPX ) );
282	282
283	283	CPLSetXMLValue( psXMLGCP, "#Y",
284		CPLSPrintf( "%.12E", psGCP->dfGCPY ) );
	284	CPLString().Printf( "%.12E", psGCP->dfGCPY ) );
285	285
286	286	if( psGCP->dfGCPZ != 0.0 )
287	287	CPLSetXMLValue( psXMLGCP, "#GCPZ",
288		CPLSPrintf( "%.12E", psGCP->dfGCPZ ) );
	288	CPLString().Printf( "%.12E", psGCP->dfGCPZ ) );
289	289	}
290	290	}

trunk/gdal/alg/gdalgeoloc.cpp

r12446	r12686
894	894	CPLCreateXMLElementAndValue(
895	895	psTree, "Reversed",
896		CPLSPrintf( "%d", psInfo->bReversed ) );
	896	CPLString().Printf( "%d", psInfo->bReversed ) );
897	897
898	898	/* -------------------------------------------------------------------- */

trunk/gdal/alg/gdaltransformer.cpp

r12446	r12686
1448	1448	/* -------------------------------------------------------------------- */
1449	1449	CPLCreateXMLElementAndValue( psTree, "MaxError",
1450		CPLS~~Printf( "%g", psInfo->dfMaxError~~ ) );
	1450	CPLString().Printf("%g",psInfo->dfMaxError) );
1451	1451
1452	1452	/* -------------------------------------------------------------------- */

trunk/gdal/alg/gdalwarper.cpp

r11879	r12686
764	764	CPLCreateXMLElementAndValue(
765	765	psTree, "WarpMemoryLimit",
766		CPLSPrintf("%g", psWO->dfWarpMemoryLimit ) );
	766	CPLString().Printf("%g", psWO->dfWarpMemoryLimit ) );
767	767
768	768	/* -------------------------------------------------------------------- */
…	…
869	869	CPLCreateXMLNode(
870	870	CPLCreateXMLNode( psBand, CXT_Attribute, "src" ),
871		CXT_Text, CPLSPrintf( "%d", psWO->panSrcBands[i] ) );
	871	CXT_Text, CPLString().Printf( "%d", psWO->panSrcBands[i] ) );
872	872	if( psWO->panDstBands != NULL )
873	873	CPLCreateXMLNode(
874	874	CPLCreateXMLNode( psBand, CXT_Attribute, "dst" ),
875		CXT_Text, CPLSPrintf( "%d", psWO->panDstBands[i] ) );
	875	CXT_Text, CPLString().Printf( "%d", psWO->panDstBands[i] ) );
876	876
877	877	if( psWO->padfSrcNoDataReal != NULL )
878	878	CPLCreateXMLElementAndValue(
879	879	psBand, "SrcNoDataReal",
880		CPLSPrintf( "%.16g", psWO->padfSrcNoDataReal[i] ) );
	880	CPLString().Printf( "%.16g", psWO->padfSrcNoDataReal[i] ) );
881	881
882	882	if( psWO->padfSrcNoDataImag != NULL )
883	883	CPLCreateXMLElementAndValue(
884	884	psBand, "SrcNoDataImag",
885		CPLSPrintf( "%.16g", psWO->padfSrcNoDataImag[i] ) );
	885	CPLString().Printf( "%.16g", psWO->padfSrcNoDataImag[i] ) );
886	886
887	887	if( psWO->padfDstNoDataReal != NULL )
888	888	CPLCreateXMLElementAndValue(
889	889	psBand, "DstNoDataReal",
890		CPLSPrintf( "%.16g", psWO->padfDstNoDataReal[i] ) );
	890	CPLString().Printf( "%.16g", psWO->padfDstNoDataReal[i] ) );
891	891
892	892	if( psWO->padfDstNoDataImag != NULL )
893	893	CPLCreateXMLElementAndValue(
894	894	psBand, "DstNoDataImag",
895		CPLSPrintf( "%.16g", psWO->padfDstNoDataImag[i] ) );
	895	CPLString().Printf( "%.16g", psWO->padfDstNoDataImag[i] ) );
896	896	}
897	897
…	…
902	902	CPLCreateXMLElementAndValue(
903	903	psTree, "SrcAlphaBand",
904		CPLSPrintf( "%d", psWO->nSrcAlphaBand ) );
	904	CPLString().Printf( "%d", psWO->nSrcAlphaBand ) );
905	905
906	906	if( psWO->nDstAlphaBand > 0 )
907	907	CPLCreateXMLElementAndValue(
908	908	psTree, "DstAlphaBand",
909		CPLSPrintf( "%d", psWO->nDstAlphaBand ) );
	909	CPLString().Printf( "%d", psWO->nDstAlphaBand ) );
910	910
911	911	return psTree;

trunk/gdal/frmts/gtiff/geotiff.cpp

r12631	r12686
2636	2636
2637	2637	{
2638		const char *pszText;
2639
2640		pszText = CPLSPrintf( "%.18g", dfNoData );
2641		TIFFSetField( hTIFF, TIFFTAG_GDAL_NODATA, pszText );
	2638	TIFFSetField( hTIFF, TIFFTAG_GDAL_NODATA,
	2639	CPLString().Printf( "%.18g", dfNoData ).c_str() );
2642	2640	}
2643	2641

trunk/gdal/frmts/jp2kak/jp2kakdataset.cpp

r12411	r12686
2423	2423	/* -------------------------------------------------------------------- */
2424	2424	oCodeStream.access_siz()->parse_string(
2425		CPLS~~Printf("Clayers=%d",layer_count~~));
	2425	CPLString().Printf("Clayers=%d",layer_count).c_str());
2426	2426	oCodeStream.access_siz()->parse_string("Cycc=no");
2427	2427	if( eType == GDT_Int16 \|\| eType == GDT_UInt16 )
…	…
2461	2461	if( pszValue != NULL )
2462	2462	{
2463		const char *pszOpt =
2464		CPLSPrintf( "%s=%s", apszParms[iParm], pszValue );
2465		oCodeStream.access_siz()->parse_string( pszOpt );
2466
2467		CPLDebug( "JP2KAK", "parse_string(%s)", pszOpt );
	2463	CPLString osOpt;
	2464
	2465	osOpt.Printf( "%s=%s", apszParms[iParm], pszValue );
	2466	oCodeStream.access_siz()->parse_string( osOpt );
	2467
	2468	CPLDebug( "JP2KAK", "parse_string(%s)", osOpt.c_str() );
2468	2469	}
2469	2470	}

trunk/gdal/frmts/mrsid/mrsiddataset.cpp

r12396	r12686
926	926	const void *pData = poMetadataRec->getArrayData( iNumDims, paiDims );
927	927	GUInt32 i, j, k = 0, iLength;
928		~~const char *pszTemp = NULL;~~
929	928	char *pszMetadata = CPLStrdup( "" );
930	929
…	…
932	931	for ( j = 0; j < paiDims[i]; j++ )
933	932	{
	933	CPLString osTemp;
	934
934	935	switch( poMetadataRec->getDataType() )
935	936	{
936	937	case LTI_METADATA_DATATYPE_UINT8:
937	938	case LTI_METADATA_DATATYPE_SINT8:
938		~~pszTemp = CPLS~~Printf( "%d", ((GByte *)pData)[k++] );
	939	osTemp.Printf( "%d", ((GByte *)pData)[k++] );
939	940	break;
940	941	case LTI_METADATA_DATATYPE_UINT16:
941		~~pszTemp = CPLS~~Printf( "%u", ((GUInt16 *)pData)[k++] );
	942	osTemp.Printf( "%u", ((GUInt16 *)pData)[k++] );
942	943	break;
943	944	case LTI_METADATA_DATATYPE_SINT16:
944		~~pszTemp = CPLS~~Printf( "%d", ((GInt16 *)pData)[k++] );
	945	osTemp.Printf( "%d", ((GInt16 *)pData)[k++] );
945	946	break;
946	947	case LTI_METADATA_DATATYPE_UINT32:
947		~~pszTemp = CPLS~~Printf( "%lu", ((unsigned long *)pData)[k++] );
	948	osTemp.Printf( "%lu", ((unsigned long *)pData)[k++] );
948	949	break;
949	950	case LTI_METADATA_DATATYPE_SINT32:
950		~~pszTemp = CPLS~~Printf( "%ld", ((long *)pData)[k++] );
	951	osTemp.Printf( "%ld", ((long *)pData)[k++] );
951	952	break;
952	953	case LTI_METADATA_DATATYPE_FLOAT32:
953		~~pszTemp = CPLS~~Printf( "%f", ((float *)pData)[k++] );
	954	osTemp.Printf( "%f", ((float *)pData)[k++] );
954	955	break;
955	956	case LTI_METADATA_DATATYPE_FLOAT64:
956		~~pszTemp = CPLS~~Printf( "%lf", ((double *)pData)[k++] );
	957	osTemp.Printf( "%lf", ((double *)pData)[k++] );
957	958	break;
958	959	case LTI_METADATA_DATATYPE_ASCII:
959		~~psz~~Temp = ((const char **)pData)[k++];
	960	osTemp = ((const char **)pData)[k++];
960	961	break;
961	962	default:
962		~~psz~~Temp = "";
	963	osTemp = "";
963	964	break;
964	965	}
965	966
966		iLength = strlen(pszMetadata) + strlen(~~psz~~Temp) + 2;
	967	iLength = strlen(pszMetadata) + strlen(osTemp) + 2;
967	968
968	969	pszMetadata = (char *)CPLRealloc( pszMetadata, iLength );
969	970	if ( !EQUAL( pszMetadata, "" ) )
970	971	strncat( pszMetadata, ",", 1 );
971		strncat( pszMetadata, ~~psz~~Temp, iLength );
	972	strncat( pszMetadata, osTemp, iLength );
972	973	}
973	974

trunk/gdal/frmts/nitf/nitfdataset.cpp

r12534	r12686
858	858	if( psImage != NULL && EQUAL(psImage->szIC,"C8") )
859	859	{
860		char *pszDSName = CPLStrdup(
861		CPLSPrintf( "J2K_SUBFILE:%d,%d,%s",
862		psFile->pasSegmentInfo[iSegment].nSegmentStart,
863		psFile->pasSegmentInfo[iSegment].nSegmentSize,
864		pszFilename ) );
865
	860	CPLString osDSName;
	861
	862	osDSName.Printf( "J2K_SUBFILE:%d,%d,%s",
	863	psFile->pasSegmentInfo[iSegment].nSegmentStart,
	864	psFile->pasSegmentInfo[iSegment].nSegmentSize,
	865	pszFilename );
	866
866	867	if( poWritableJ2KDataset != NULL )
867	868	{
…	…
873	874	{
874	875	poDS->poJ2KDataset = (GDALDataset *)
875		GDALOpen( pszDSName, GA_ReadOnly );
876		CPLFree( pszDSName );
	876	GDALOpen( osDSName, GA_ReadOnly );
877	877	}
878	878
…	…
934	934	poDS->nQLevel = poDS->ScanJPEGQLevel( &nJPEGStart );
935	935
936		~~char *pszDSName = CPLStrdup(~~
937		CPLSPrintf( "JPEG_SUBFILE:Q%d,%d,%d,%s",
938		~~poDS->nQLevel,~~
939		nJPEGStart,
940		psFile->pasSegmentInfo[iSegment].nSegmentSize
941		- (nJPEGStart - psFile->pasSegmentInfo[iSegment].nSegmentStart),
942		~~pszFilename )~~ );
	936	CPLString osDSName;
	937
	938	osDSName.Printf( "JPEG_SUBFILE:Q%d,%d,%d,%s",
	939	poDS->nQLevel, nJPEGStart,
	940	psFile->pasSegmentInfo[iSegment].nSegmentSize
	941	- (nJPEGStart - psFile->pasSegmentInfo[iSegment].nSegmentStart),
	942	pszFilename );
943	943
944	944	CPLDebug( "GDAL",
945	945	"NITFDataset::Open() as IC=C3 (JPEG compressed)\n");
946	946
947		poDS->poJPEGDataset = (GDALDataset *) GDALOpen( pszDSName, GA_ReadOnly );
948		CPLFree( pszDSName );
949
	947	poDS->poJPEGDataset = (GDALDataset *) GDALOpen( osDSName, GA_ReadOnly);
950	948	if( poDS->poJPEGDataset == NULL )
951	949	{
…	…
2474	2472	int nImageOffset = psFile->pasSegmentInfo[0].nSegmentStart;
2475	2473
2476		~~char *pszDSName = CPLStrdup(~~
2477		CPLSPrintf( "J2K_SUBFILE:%d,%d,%s", nImageOffset, -1,
2478		~~pszFilename )~~ );
	2474	CPLString osDSName;
	2475
	2476	osDSName.Printf("J2K_SUBFILE:%d,%d,%s", nImageOffset, -1, pszFilename);
2479	2477
2480	2478	NITFClose( psFile );
2481	2479
2482	2480	poWritableJ2KDataset =
2483		poJ2KDriver->Create( ~~psz~~DSName, nXSize, nYSize, nBands, eType,
	2481	poJ2KDriver->Create( osDSName, nXSize, nYSize, nBands, eType,
2484	2482	(char **)NITFJP2Options( papszOptions ) );
2485		~~CPLFree( pszDSName );~~
2486	2483
2487	2484	if( poWritableJ2KDataset == NULL )
…	…
2605	2602	papszFullOptions =
2606	2603	CSLSetNameValue( papszFullOptions, "LUT_SIZE",
2607		CPLS~~Printf("%d",~~
2608		poBand1->GetColorTable()->GetColorEntryCount()) );
	2604	CPLString().Printf(
	2605	"%d", poBand1->GetColorTable()->GetColorEntryCount()) );
2609	2606	}
2610	2607	else if( GDALDataTypeIsComplex(eType) )
…	…
2678	2675	GDALDataset *poJ2KDataset = NULL;
2679	2676	int nImageOffset = psFile->pasSegmentInfo[0].nSegmentStart;
2680
2681		char *pszDSName = CPLStrdup(
2682		~~CPLS~~Printf( "J2K_SUBFILE:%d,%d,%s", nImageOffset, -1,
2683		~~pszFilename )~~ );
	2677	CPLString osDSName;
	2678
	2679	osDSName.Printf( "J2K_SUBFILE:%d,%d,%s", nImageOffset, -1,
	2680	pszFilename );
2684	2681
2685	2682	NITFClose( psFile );
2686	2683
2687	2684	poJ2KDataset =
2688		poJ2KDriver->CreateCopy( ~~psz~~DSName, poSrcDS, FALSE,
	2685	poJ2KDriver->CreateCopy( osDSName, poSrcDS, FALSE,
2689	2686	(char **)NITFJP2Options(papszOptions),
2690	2687	pfnProgress, pProgressData );
2691		~~CPLFree( pszDSName );~~
2692	2688	if( poJ2KDataset == NULL )
2693	2689	return NULL;
…	…
2847	2843	/* -------------------------------------------------------------------- */
2848	2844	VSIFSeekL( fpVSIL, 342, SEEK_SET );
2849		VSIFWriteL( (void *) CPLS~~Printf("%012d",nFileLen),~~
	2845	VSIFWriteL( (void *) CPLString().Printf("%012d",nFileLen).c_str(),
2850	2846	1, 12, fpVSIL );
2851	2847
…	…
2854	2850	/* -------------------------------------------------------------------- */
2855	2851	VSIFSeekL( fpVSIL, 369, SEEK_SET );
2856		VSIFWriteL( (void *) CPLSPrintf("%010d",nFileLen-nImageOffset),
	2852	VSIFWriteL( (void *)
	2853	CPLString().Printf("%010d",nFileLen-nImageOffset).c_str(),
2857	2854	1, 10, fpVSIL );
2858	2855

trunk/gdal/ogr/ogr_srs_panorama.cpp

r12594	r12686
468	468	default:
469	469	CPLDebug( "OSR_Panorama", "Unsupported projection: %d", iProjSys );
470		SetLocalCS( CPLSPrintf("\"Panorama\" projection number %d",
	470	SetLocalCS( CPLString().Printf("\"Panorama\" projection number %d",
471	471	iProjSys) );
472	472	break;
…	…
498	498	&dfSemiMajor, &dfInvFlattening ) )
499	499	{
500		SetGeogCS( CPLSPrintf("Unknown datum based upon the %s ellipsoid",
	500	SetGeogCS( CPLString().Printf("Unknown datum based upon the %s ellipsoid",
501	501	pszName ),
502		CPLSPrintf( "Not specified (based on %s spheroid)",
	502	CPLString().Printf( "Not specified (based on %s spheroid)",
503	503	pszName ),
504	504	pszName, dfSemiMajor, dfInvFlattening,

trunk/gdal/ogr/ogr_srs_pci.cpp

r12018	r12686
616	616	PCIGetEllipsoidInfo( paoDatum->nEPSGCode, &pszName,
617	617	&dfSemiMajor, &dfInvFlattening );
618		SetGeogCS( CPLSPrintf(
	618	SetGeogCS( CPLString().Printf(
619	619	"Unknown datum based upon the %s ellipsoid",
620	620	pszName ),
621		CPLSPrintf(
	621	CPLString().Printf(
622	622	"Not specified (based on %s spheroid)",
623	623	pszName ),

trunk/gdal/ogr/ogr_srs_usgs.cpp

r12019	r12686
749	749	default:
750	750	CPLDebug( "OSR_USGS", "Unsupported projection: %d", iProjSys );
751		SetLocalCS( CPLSPrintf("GCTP projection number %d", iProjSys) );
	751	SetLocalCS( CPLString().Printf("GCTP projection number %d", iProjSys) );
752	752	break;
753	753
…	…
794	794	USGSGetEllipsoidInfo( 7008, &pszName, &dfSemiMajor,
795	795	&dfInvFlattening );
796		SetGeogCS( CPLSPrintf(
	796	SetGeogCS( CPLString().Printf(
797	797	"Unknown datum based upon the %s ellipsoid",
798	798	pszName ),
799		CPLSPrintf( "Not specified (based on %s spheroid)",
800		pszName ),
	799	CPLString().Printf(
	800	"Not specified (based on %s spheroid)",
	801	pszName ),
801	802	pszName, dfSemiMajor, dfInvFlattening,
802	803	NULL, 0.0, NULL, 0.0 );
…	…
807	808	USGSGetEllipsoidInfo( 7047, &pszName, &dfSemiMajor,
808	809	&dfInvFlattening );
809		SetGeogCS( CPLSPrintf(
	810	SetGeogCS( CPLString().Printf(
810	811	"Unknown datum based upon the %s ellipsoid",
811	812	pszName ),
812		CPLSPrintf( "Not specified (based on %s spheroid)",
	813	CPLString().Printf( "Not specified (based on %s spheroid)",
813	814	pszName ),
814	815	pszName, dfSemiMajor, dfInvFlattening,
…	…
823	824	&dfSemiMajor, &dfInvFlattening ) )
824	825	{
825		SetGeogCS( CPLSPrintf("Unknown datum based upon the %s ellipsoid",
	826	SetGeogCS( CPLString().Printf("Unknown datum based upon the %s ellipsoid",
826	827	pszName ),
827		CPLSPrintf( "Not specified (based on %s spheroid)",
	828	CPLString().Printf( "Not specified (based on %s spheroid)",
828	829	pszName ),
829	830	pszName, dfSemiMajor, dfInvFlattening,

trunk/gdal/ogr/ogr_srs_xml.cpp

r12520	r12686
331	331
332	332	CPLCreateXMLNode( psValue, CXT_Text,
333		CPLSPrintf( "%.16g", dfParmValue ) );
	333	CPLString().Printf( "%.16g", dfParmValue ) );
334	334
335	335	/* -------------------------------------------------------------------- */
…	…
522	522	CXT_Text, "urn:ogc:def:uom:EPSG::9102" );
523	523
524		CPLCreateXMLNode( psAngle, CXT_Text, CPLSPrintf( "%.16g", dfPMOffset ) );
525
	524	CPLCreateXMLNode( psAngle, CXT_Text,
	525	CPLString().Printf( "%.16g", dfPMOffset ) );
	526
526	527	/* -------------------------------------------------------------------- */
527	528	/* Translate the ellipsoid. */

trunk/gdal/ogr/ogrfeaturestyle.cpp

r12228	r12686
288	288	if (m_pszStyleString)
289	289	{
290		pszTmp = CPLStrdup(CPLSPrintf("%s;%s",m_pszStyleString,
	290	pszTmp = CPLStrdup(CPLString().Printf("%s;%s",m_pszStyleString,
291	291	pszPart));
292	292	CPLFree(m_pszStyleString);
…	…
295	295	else
296	296	{
297		pszTmp= CPLStrdup(CPLSPrintf("%s",pszPart));
	297	pszTmp= CPLStrdup(CPLString().Printf("%s",pszPart));
298	298	CPLFree(m_pszStyleString);
299	299	m_pszStyleString = pszTmp;
…	…
316	316	if (m_pszStyleString)
317	317	{
318		pszTmp = CPLStrdup(CPLSPrintf("%s;%s",m_pszStyleString,
	318	pszTmp = CPLStrdup(CPLString().Printf("%s;%s",m_pszStyleString,
319	319	poStyleTool->GetStyleString()));
320	320	CPLFree(m_pszStyleString);
…	…
323	323	else
324	324	{
325		pszTmp= CPLStrdup(CPLSPrintf("%s",
	325	pszTmp= CPLStrdup(CPLString().Printf("%s",
326	326	poStyleTool->GetStyleString()));
327	327	CPLFree(m_pszStyleString);
…	…
527	527	return FALSE;
528	528
529		pszNewString = CPLSPrintf("%s:%s",pszName,pszStyleString);
	529	pszNewString = CPLString().Printf("%s:%s",pszName,pszStyleString);
530	530
531	531	m_papszStyleTable = CSLAddString(m_papszStyleTable,pszNewString);
…	…
661	661	return -1;
662	662
663		pszNewString = CPLSPrintf("%s:",pszName);
	663	pszNewString = CPLString().Printf("%s:",pszName);
664	664
665	665	for (i=0;i<CSLCount(m_papszStyleTable);i++)
…	…
793	793	break;
794	794	case OGRSTypeDouble:
795		strcat(szCurrent,CPLSPrintf(":%f",pasStyleValue[i].dfValue));
	795	strcat(szCurrent,CPLString().Printf(":%f",pasStyleValue[i].dfValue));
796	796	break;
797	797	case OGRSTypeInteger:
798		strcat(szCurrent,CPLSPrintf(":%d",pasStyleValue[i].nValue));
	798	strcat(szCurrent,CPLString().Printf(":%d",pasStyleValue[i].nValue));
799	799	break;
800	800	default:
…	…
1245	1245	case OGRSTypeDouble:
1246	1246	if (sStyleParam.bGeoref)
1247		return CPLSPrintf("%f",ComputeWithUnit(sStyleValue.dfValue,
	1247	return CPLString().Printf("%f",ComputeWithUnit(sStyleValue.dfValue,
1248	1248	sStyleValue.eUnit));
1249	1249	else
1250		return CPLSPrintf("%f",sStyleValue.dfValue);
	1250	return CPLString().Printf("%f",sStyleValue.dfValue);
1251	1251
1252	1252	case OGRSTypeInteger:
1253	1253	if (sStyleParam.bGeoref)
1254		return CPLSPrintf("%d",ComputeWithUnit(sStyleValue.nValue,
	1254	return CPLString().Printf("%d",ComputeWithUnit(sStyleValue.nValue,
1255	1255	sStyleValue.eUnit));
1256	1256	else
1257		return CPLSPrintf("%d",sStyleValue.nValue);
	1257	return CPLString().Printf("%d",sStyleValue.nValue);
1258	1258	case OGRSTypeBoolean:
1259		return CPLSPrintf("%d",sStyleValue.nValue);
	1259	return CPLString().Printf("%d",sStyleValue.nValue);
1260	1260	default:
1261	1261	bValueIsNull = TRUE;
…	…
1381	1381	// if sStyleParam.bGeoref == TRUE , need to convert to output value;
1382	1382	case OGRSTypeString:
1383		sStyleValue.pszValue = CPLStrdup(CPLSPrintf("%d",nParam));
	1383	sStyleValue.pszValue = CPLStrdup(CPLString().Printf("%d",nParam));
1384	1384	break;
1385	1385	case OGRSTypeDouble:
…	…
1415	1415	// if sStyleParam.bGeoref == TRUE , need to convert to output value;
1416	1416	case OGRSTypeString:
1417		sStyleValue.pszValue = CPLStrdup(CPLSPrintf("%f",dfParam));
	1417	sStyleValue.pszValue = CPLStrdup(CPLString().Printf("%f",dfParam));
1418	1418	break;
1419	1419	case OGRSTypeDouble:

Navigation

Changeset 12686

Legend:

Download in other formats: