From: Hermet Park Date: Thu, 6 Aug 2020 07:38:12 +0000 (+0900) Subject: common: fix compile warnings. X-Git-Tag: accepted/tizen/unified/20200810.123122~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7214559ad9ec43027b15ea717ded343daa3c22d1;p=platform%2Fcore%2Fgraphics%2Ftizenvg.git common: fix compile warnings. --Werror=unused-parameter Change-Id: If4c04e3e20b67be62b50c3b1e2e909dbd848eccc --- diff --git a/src/lib/gl_engine/tvgGlGeometry.cpp b/src/lib/gl_engine/tvgGlGeometry.cpp index eba6fbf..5728b56 100644 --- a/src/lib/gl_engine/tvgGlGeometry.cpp +++ b/src/lib/gl_engine/tvgGlGeometry.cpp @@ -63,7 +63,7 @@ bool GlGeometry::decomposeOutline(const Shape &shape) return true; } -bool GlGeometry::generateAAPoints(const Shape &shape, float strokeWd, RenderUpdateFlag flag) +bool GlGeometry::generateAAPoints(TVG_UNUSED const Shape &shape, float strokeWd, RenderUpdateFlag flag) { for (auto& shapeGeometry : mPrimitives) { @@ -128,7 +128,7 @@ bool GlGeometry::generateAAPoints(const Shape &shape, float strokeWd, RenderUpda return true; } -bool GlGeometry::tesselate(const Shape &shape, float viewWd, float viewHt, RenderUpdateFlag flag) +bool GlGeometry::tesselate(TVG_UNUSED const Shape &shape, float viewWd, float viewHt, RenderUpdateFlag flag) { for (auto& shapeGeometry : mPrimitives) { diff --git a/src/lib/gl_engine/tvgGlRenderer.cpp b/src/lib/gl_engine/tvgGlRenderer.cpp index d9acf61..c47f2e0 100644 --- a/src/lib/gl_engine/tvgGlRenderer.cpp +++ b/src/lib/gl_engine/tvgGlRenderer.cpp @@ -41,7 +41,7 @@ bool GlRenderer::clear() } -bool GlRenderer::target(uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t h) +bool GlRenderer::target(TVG_UNUSED uint32_t* buffer, uint32_t stride, uint32_t w, uint32_t h) { assert(w > 0 && h > 0); @@ -109,7 +109,7 @@ bool GlRenderer::render(const Shape& shape, void *data) } -bool GlRenderer::dispose(const Shape& shape, void *data) +bool GlRenderer::dispose(TVG_UNUSED const Shape& shape, void *data) { GlShape* sdata = static_cast(data); if (!sdata) return false; @@ -119,7 +119,7 @@ bool GlRenderer::dispose(const Shape& shape, void *data) } -void* GlRenderer::prepare(const Shape& shape, void* data, const RenderTransform* transform, RenderUpdateFlag flags) +void* GlRenderer::prepare(const Shape& shape, void* data, TVG_UNUSED const RenderTransform* transform, RenderUpdateFlag flags) { //prepare shape data GlShape* sdata = static_cast(data); diff --git a/src/lib/sw_engine/tvgSwRenderer.cpp b/src/lib/sw_engine/tvgSwRenderer.cpp index aac6d8e..9f618de 100644 --- a/src/lib/sw_engine/tvgSwRenderer.cpp +++ b/src/lib/sw_engine/tvgSwRenderer.cpp @@ -129,7 +129,7 @@ bool SwRenderer::flush() } -bool SwRenderer::render(const Shape& sdata, void *data) +bool SwRenderer::render(TVG_UNUSED const Shape& sdata, TVG_UNUSED void *data) { //Do Nothing @@ -137,7 +137,7 @@ bool SwRenderer::render(const Shape& sdata, void *data) } -bool SwRenderer::dispose(const Shape& sdata, void *data) +bool SwRenderer::dispose(TVG_UNUSED const Shape& sdata, void *data) { auto task = static_cast(data); if (!task) return true; diff --git a/src/lib/sw_engine/tvgSwShape.cpp b/src/lib/sw_engine/tvgSwShape.cpp index 2165f42..e558436 100644 --- a/src/lib/sw_engine/tvgSwShape.cpp +++ b/src/lib/sw_engine/tvgSwShape.cpp @@ -470,7 +470,7 @@ bool shapePrepare(SwShape& shape, const Shape* sdata, const SwSize& clip, const } -bool shapeGenRle(SwShape& shape, const Shape* sdata, const SwSize& clip, bool antiAlias) +bool shapeGenRle(SwShape& shape, TVG_UNUSED const Shape* sdata, const SwSize& clip, bool antiAlias) { //FIXME: Should we draw it? //Case: Stroke Line diff --git a/src/loaders/svg_loader/tvgSimpleXmlParser.cpp b/src/loaders/svg_loader/tvgSimpleXmlParser.cpp index 4081453..c55042f 100644 --- a/src/loaders/svg_loader/tvgSimpleXmlParser.cpp +++ b/src/loaders/svg_loader/tvgSimpleXmlParser.cpp @@ -141,7 +141,7 @@ bool simpleXmlParse(const char* buf, unsigned bufLength, bool strip, simpleXMLCb do { \ size_t _sz = end - start; \ bool _ret; \ - _ret = func((void*)data, type, start, start - buf, _sz); \ + _ret = func((void*)data, type, start, _sz); \ if (!_ret) \ return false; \ } while (0) diff --git a/src/loaders/svg_loader/tvgSimpleXmlParser.h b/src/loaders/svg_loader/tvgSimpleXmlParser.h index 4e3b3a7..ee241ce 100644 --- a/src/loaders/svg_loader/tvgSimpleXmlParser.h +++ b/src/loaders/svg_loader/tvgSimpleXmlParser.h @@ -20,7 +20,7 @@ enum class SimpleXMLType DoctypeChild //!< \style; _toColor(value, &style->r, &style->g, &style->b, nullptr); } -static void _handleFillAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleFillAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { SvgStyleProperty* style = node->style; style->fill.flags = (SvgFillFlags)((int)style->fill.flags | (int)SvgFillFlags::Paint); - _handlePaintAttr(loader, &style->fill.paint, value); + _handlePaintAttr(&style->fill.paint, value); } -static void _handleStrokeAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleStrokeAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { SvgStyleProperty* style = node->style; style->stroke.flags = (SvgStrokeFlags)((int)style->stroke.flags | (int)SvgStrokeFlags::Paint); - _handlePaintAttr(loader, &style->stroke.paint, value); + _handlePaintAttr(&style->stroke.paint, value); } -static void _handleStrokeOpacityAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleStrokeOpacityAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { node->style->stroke.flags = (SvgStrokeFlags)((int)node->style->stroke.flags | (int)SvgStrokeFlags::Opacity); node->style->stroke.opacity = _toOpacity(value); @@ -780,47 +780,47 @@ static void _handleStrokeWidthAttr(SvgLoaderData* loader, SvgNode* node, const c } -static void _handleStrokeLineCapAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleStrokeLineCapAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { node->style->stroke.flags = (SvgStrokeFlags)((int)node->style->stroke.flags | (int)SvgStrokeFlags::Cap); node->style->stroke.cap = _toLineCap(value); } -static void _handleStrokeLineJoinAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleStrokeLineJoinAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { node->style->stroke.flags = (SvgStrokeFlags)((int)node->style->stroke.flags | (int)SvgStrokeFlags::Join); node->style->stroke.join = _toLineJoin(value); } -static void _handleFillRuleAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleFillRuleAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { node->style->fill.flags = (SvgFillFlags)((int)node->style->fill.flags | (int)SvgFillFlags::FillRule); node->style->fill.fillRule = _toFillRule(value); } -static void _handleOpacityAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleOpacityAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { node->style->opacity = _toOpacity(value); } -static void _handleFillOpacityAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleFillOpacityAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { node->style->fill.flags = (SvgFillFlags)((int)node->style->fill.flags | (int)SvgFillFlags::Opacity); node->style->fill.opacity = _toOpacity(value); } -static void _handleTransformAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleTransformAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { node->transform = _parseTransformationMatrix(value); } -static void _handleDisplayAttr(SvgLoaderData* loader, SvgNode* node, const char* value) +static void _handleDisplayAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value) { //TODO : The display attribute can have various values as well as "none". // The default is "inline" which means visible and "none" means invisible. @@ -946,7 +946,7 @@ static SvgNode* _createNode(SvgNode* parent, SvgNodeType type) } -static SvgNode* _createDefsNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength) +static SvgNode* _createDefsNode(TVG_UNUSED SvgLoaderData* loader, TVG_UNUSED SvgNode* parent, const char* buf, unsigned bufLength) { SvgNode* node = _createNode(nullptr, SvgNodeType::Defs); simpleXmlParseAttributes(buf, bufLength, nullptr, node); @@ -954,7 +954,7 @@ static SvgNode* _createDefsNode(SvgLoaderData* loader, SvgNode* parent, const ch } -static SvgNode* _createGNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength) +static SvgNode* _createGNode(TVG_UNUSED SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength) { loader->svgParse->node = _createNode(parent, SvgNodeType::G); @@ -1907,7 +1907,7 @@ static constexpr struct }; -static void _svgLoaderParerXmlClose(SvgLoaderData* loader, const char* content, unsigned int length) +static void _svgLoaderParerXmlClose(SvgLoaderData* loader, const char* content) { unsigned int i; @@ -1999,7 +1999,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content, } -static bool _svgLoaderParser(void* data, SimpleXMLType type, const char* content, unsigned int offset, unsigned int length) +static bool _svgLoaderParser(void* data, SimpleXMLType type, const char* content, unsigned int length) { SvgLoaderData* loader = (SvgLoaderData*)data; @@ -2013,7 +2013,7 @@ static bool _svgLoaderParser(void* data, SimpleXMLType type, const char* content break; } case SimpleXMLType::Close: { - _svgLoaderParerXmlClose(loader, content, length); + _svgLoaderParerXmlClose(loader, content); break; } case SimpleXMLType::Data: @@ -2238,7 +2238,7 @@ static bool _svgLoaderParserForValidCheckXmlOpen(SvgLoaderData* loader, const ch } -static bool _svgLoaderParserForValidCheck(void* data, SimpleXMLType type, const char* content, unsigned int offset, unsigned int length) +static bool _svgLoaderParserForValidCheck(void* data, SimpleXMLType type, const char* content, unsigned int length) { SvgLoaderData* loader = (SvgLoaderData*)data; bool res = true;; diff --git a/src/loaders/svg_loader/tvgSvgPath.cpp b/src/loaders/svg_loader/tvgSvgPath.cpp index bd43027..03cde1e 100644 --- a/src/loaders/svg_loader/tvgSvgPath.cpp +++ b/src/loaders/svg_loader/tvgSvgPath.cpp @@ -36,7 +36,7 @@ static bool _parseLong(char** content, int* number) return true; } -void _pathAppendArcTo(vector* cmds, vector* pts, float* arr, Point* cur, Point* curCtl, float x, float y, float rx, float ry, float angle, bool largeArc, bool sweep) +void _pathAppendArcTo(vector* cmds, vector* pts, Point* cur, Point* curCtl, float x, float y, float rx, float ry, float angle, bool largeArc, bool sweep) { float cxp, cyp, cx, cy; float sx, sy; @@ -394,7 +394,7 @@ static void _processCommand(vector* cmds, vector* pts, char } case 'a': case 'A': { - _pathAppendArcTo(cmds, pts, arr, cur, curCtl, arr[5], arr[6], arr[0], arr[1], arr[2], arr[3], arr[4]); + _pathAppendArcTo(cmds, pts, cur, curCtl, arr[5], arr[6], arr[0], arr[1], arr[2], arr[3], arr[4]); *cur = {arr[5] ,arr[6]}; break; }