git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-19 22:41:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

tvg_loader: code refactoring.

Browse source 
remove if-def code.

Actually, tvg log is supposed to print some useful info for users,
not debugging info for our engine developers.
This commit is contained in:
Hermet Park 2021-06-22 17:05:38 +09:00
parent a2d348242b
commit 58f251163b
1 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/loaders/tvg/tvgTvgLoadParser.cpp
View file

@ -28,7 +28,7 @@
/* Internal Class Implementation */
/************************************************************************/
enum class LoaderResult { InvalidType, Success, SizeCorruption, MemoryCorruption, LogicalCorruption };
enum class LoaderResult { Success = 0, InvalidType, SizeCorruption, MemoryCorruption, LogicalCorruption };
static LoaderResult _parsePaint(tvgBlock block, Paint ** paint);
@ -59,14 +59,10 @@ static bool _readTvgHeader(const char **ptr)
_read_tvg_ui16(&metaLen, *ptr);
*ptr += 2;
//Meta data... Necessary?
#ifdef THORVG_LOG_ENABLED
char metadata[metaLen + 1];
memcpy(metadata, *ptr, metaLen);
metadata[metaLen] = '\0';
printf("TVG_LOADER: Header is valid, metadata[%d]: %s.\n", metaLen, metadata);
#endif
//Meta data... Need to replace checksum way.
//char metadata[metaLen + 1];
//memcpy(metadata, *ptr, metaLen);
//metadata[metaLen] = '\0';
*ptr += metaLen;
@ -440,13 +436,8 @@ static LoaderResult _parsePaint(tvgBlock base_block, Paint **paint)
auto result = _parseSceneProperty(block, s.get());
if (result == LoaderResult::InvalidType) result = _parsePaintProperty(block, s.get());
if (result > LoaderResult::Success) return result;
if (result > LoaderResult::Success) {
#ifdef THORVG_LOG_ENABLED
printf("TVG_LOADER: Loading scene error[type: 0x%02x]: %d\n", (int) block.type, (int) result);
#endif
return result;
}
ptr = block.end;
}
*paint = s.release();
@ -461,13 +452,7 @@ static LoaderResult _parsePaint(tvgBlock base_block, Paint **paint)
auto result = _parseShapeProperty(block, s.get());
if (result == LoaderResult::InvalidType) result = _parsePaintProperty(block, s.get());
if (result > LoaderResult::Success) {
#ifdef THORVG_LOG_ENABLED
printf("TVG_LOADER: Loading shape error[type: 0x%02x]: %d\n", (int) block.type, (int) result);
#endif
return result;
}
if (result > LoaderResult::Success) return result;
ptr = block.end;
}
*paint = s.release();
@ -482,13 +467,7 @@ static LoaderResult _parsePaint(tvgBlock base_block, Paint **paint)
auto result = _parsePicture(block, s.get());
if (result == LoaderResult::InvalidType) result = _parsePaintProperty(block, s.get());
if (result > LoaderResult::Success) {
#ifdef THORVG_LOG_ENABLED
printf("TVG_LOADER: Loading picture error[type: 0x%02x]: %d\n", (int) block.type, (int) result);
#endif
return result;
}
if (result > LoaderResult::Success) return result;
ptr = block.end;
}
*paint = s.release();