mirror of
https://github.com/thorvg/thorvg.git
synced 2025-06-14 12:04:29 +00:00
code refactoring
remove unnecessary condition. implementation won't be included multiple times not like headers. Thus this condition is unnecessary. Change-Id: Id37e675c40ce7213a06c950da8e5ca17ff7245c9
This commit is contained in:
parent
9d58643a6c
commit
04c6295974
26 changed files with 26 additions and 160 deletions
|
@ -19,10 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef _TVG_GL_RENDERER_CPP_
|
||||
#define _TVG_GL_RENDERER_CPP_
|
||||
|
||||
#include "tvgGlShaderSrc.h"
|
||||
#include "tvgGlGpuBuffer.h"
|
||||
#include "tvgGlGeometry.h"
|
||||
|
@ -217,5 +213,3 @@ void GlRenderer::drawPrimitive(GlGeometry& geometry, float r, float g, float b,
|
|||
geometry.disableVertex(mVertexAttrLoc);
|
||||
|
||||
}
|
||||
|
||||
#endif /* _TVG_GL_RENDERER_CPP_ */
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SW_FILL_CPP_
|
||||
#define _TVG_SW_FILL_CPP_
|
||||
|
||||
#include "tvgSwCommon.h"
|
||||
|
||||
|
||||
|
@ -315,5 +312,3 @@ void fillFree(SwFill* fill)
|
|||
|
||||
free(fill);
|
||||
}
|
||||
|
||||
#endif /* _TVG_SW_FILL_CPP_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SW_MATH_H_
|
||||
#define _TVG_SW_MATH_H_
|
||||
|
||||
#include "tvgSwCommon.h"
|
||||
|
||||
|
||||
|
@ -418,4 +415,3 @@ SwFixed mathDiff(SwFixed angle1, SwFixed angle2)
|
|||
|
||||
return delta;
|
||||
}
|
||||
#endif /* _TVG_SW_MATH_H_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SW_RASTER_CPP_
|
||||
#define _TVG_SW_RASTER_CPP_
|
||||
|
||||
#include "tvgSwCommon.h"
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -370,5 +367,3 @@ bool rasterClear(SwSurface* surface)
|
|||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif /* _TVG_SW_RASTER_CPP_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SW_RENDERER_CPP_
|
||||
#define _TVG_SW_RENDERER_CPP_
|
||||
|
||||
#include "tvgSwCommon.h"
|
||||
#include "tvgSwRenderer.h"
|
||||
|
||||
|
@ -186,5 +183,3 @@ SwRenderer* SwRenderer::inst()
|
|||
//We know renderer type, avoid dynamic_cast for performance.
|
||||
return static_cast<SwRenderer*>(RenderInitializer::inst(renderInit));
|
||||
}
|
||||
|
||||
#endif /* _TVG_SW_RENDERER_CPP_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SW_RLE_H_
|
||||
#define _TVG_SW_RLE_H_
|
||||
|
||||
#include <setjmp.h>
|
||||
#include <limits.h>
|
||||
#include <memory.h>
|
||||
|
@ -755,5 +752,3 @@ void rleFree(SwRleData* rle)
|
|||
if (rle->spans) free(rle->spans);
|
||||
free(rle);
|
||||
}
|
||||
|
||||
#endif /* _TVG_SW_RLE_H_ */
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SW_SHAPE_H_
|
||||
#define _TVG_SW_SHAPE_H_
|
||||
|
||||
#include "tvgSwCommon.h"
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -673,6 +670,3 @@ void shapeDelFill(SwShape* shape)
|
|||
fillFree(shape->fill);
|
||||
shape->fill = nullptr;
|
||||
}
|
||||
|
||||
|
||||
#endif /* _TVG_SW_SHAPE_H_ */
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SW_STROKER_H_
|
||||
#define _TVG_SW_STROKER_H_
|
||||
|
||||
#include "tvgSwCommon.h"
|
||||
|
||||
|
||||
|
@ -925,5 +922,3 @@ SwOutline* strokeExportOutline(SwStroke* stroke)
|
|||
|
||||
return outline;
|
||||
}
|
||||
|
||||
#endif /* _TVG_SW_STROKER_H_ */
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_BEZIER_CPP_
|
||||
#define _TVG_BEZIER_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
|
||||
|
||||
|
@ -143,7 +140,4 @@ void bezSplitAt(const Bezier& cur, float at, Bezier& left, Bezier& right)
|
|||
bezSplitLeft(right, t, left);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endif //_TVG_BEZIER_CPP_
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_CANVAS_CPP_
|
||||
#define _TVG_CANVAS_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
#include "tvgCanvasImpl.h"
|
||||
|
||||
|
@ -76,5 +73,3 @@ Result Canvas::sync() noexcept
|
|||
|
||||
return Result::InsufficientCondition;
|
||||
}
|
||||
|
||||
#endif /* _TVG_CANVAS_CPP_ */
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_FILL_CPP_
|
||||
#define _TVG_FILL_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
|
||||
|
||||
|
@ -100,5 +97,3 @@ FillSpread Fill::spread() const noexcept
|
|||
{
|
||||
return IMPL->spread;
|
||||
}
|
||||
|
||||
#endif /* _TVG_FILL_CPP_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_GLCANVAS_CPP_
|
||||
#define _TVG_GLCANVAS_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
#include "tvgCanvasImpl.h"
|
||||
|
||||
|
@ -85,6 +82,3 @@ unique_ptr<GlCanvas> GlCanvas::gen() noexcept
|
|||
#endif
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
#endif /* _TVG_GLCANVAS_CPP_ */
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_INITIALIZER_CPP_
|
||||
#define _TVG_INITIALIZER_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
#include "tvgLoaderMgr.h"
|
||||
|
||||
|
@ -108,5 +105,3 @@ uint32_t Initializer::threads() noexcept
|
|||
{
|
||||
return threadCnt;
|
||||
}
|
||||
|
||||
#endif /* _TVG_INITIALIZER_CPP_ */
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_LINEAR_GRADIENT_CPP_
|
||||
#define _TVG_LINEAR_GRADIENT_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -78,5 +75,3 @@ unique_ptr<LinearGradient> LinearGradient::gen() noexcept
|
|||
{
|
||||
return unique_ptr<LinearGradient>(new LinearGradient);
|
||||
}
|
||||
|
||||
#endif /* _TVG_LINEAR_GRADIENT_CPP_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_LOADER_MGR_CPP_
|
||||
#define _TVG_LOADER_MGR_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
|
||||
#ifdef THORVG_SVG_LOADER_SUPPORT
|
||||
|
@ -57,5 +54,3 @@ unique_ptr<Loader> LoaderMgr::loader()
|
|||
#endif
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
#endif //_TVG_LOADER_MGR_CPP_
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_PAINT_CPP_
|
||||
#define _TVG_PAINT_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -75,5 +72,3 @@ Result Paint::bounds(float* x, float* y, float* w, float* h) const noexcept
|
|||
if (IMPL->bounds(x, y, w, h)) return Result::Success;
|
||||
return Result::InsufficientCondition;
|
||||
}
|
||||
|
||||
#endif //_TVG_PAINT_CPP_
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_PICTURE_CPP_
|
||||
#define _TVG_PICTURE_CPP_
|
||||
|
||||
#include "tvgPictureImpl.h"
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -66,5 +63,3 @@ Result Picture::viewbox(float* x, float* y, float* w, float* h) const noexcept
|
|||
if (IMPL->viewbox(x, y, w, h)) return Result::Success;
|
||||
return Result::InsufficientCondition;
|
||||
}
|
||||
|
||||
#endif /* _TVG_PICTURE_CPP_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_RADIAL_GRADIENT_CPP_
|
||||
#define _TVG_RADIAL_GRADIENT_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -75,5 +72,3 @@ unique_ptr<RadialGradient> RadialGradient::gen() noexcept
|
|||
{
|
||||
return unique_ptr<RadialGradient>(new RadialGradient);
|
||||
}
|
||||
|
||||
#endif /* _TVG_RADIAL_GRADIENT_CPP_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_RENDER_CPP_
|
||||
#define _TVG_RENDER_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -119,5 +116,3 @@ RenderTransform::RenderTransform(const RenderTransform* lhs, const RenderTransfo
|
|||
m.e32 = lhs->m.e31 * rhs->m.e12 + lhs->m.e32 * rhs->m.e22 + lhs->m.e33 * rhs->m.e32;
|
||||
m.e33 = lhs->m.e31 * rhs->m.e13 + lhs->m.e32 * rhs->m.e23 + lhs->m.e33 * rhs->m.e33;
|
||||
}
|
||||
|
||||
#endif //_TVG_RENDER_CPP_
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SCENE_CPP_
|
||||
#define _TVG_SCENE_CPP_
|
||||
|
||||
#include "tvgSceneImpl.h"
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -61,5 +58,3 @@ Result Scene::reserve(uint32_t size) noexcept
|
|||
|
||||
return Result::Success;
|
||||
}
|
||||
|
||||
#endif /* _TVG_SCENE_CPP_ */
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SHAPE_CPP_
|
||||
#define _TVG_SHAPE_CPP_
|
||||
|
||||
#include <limits>
|
||||
|
||||
#include "tvgShapeImpl.h"
|
||||
|
@ -406,6 +403,3 @@ StrokeJoin Shape::strokeJoin() const noexcept
|
|||
|
||||
return IMPL->stroke->join;
|
||||
}
|
||||
|
||||
|
||||
#endif //_TVG_SHAPE_CPP_
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SWCANVAS_CPP_
|
||||
#define _TVG_SWCANVAS_CPP_
|
||||
|
||||
#include "tvgCommon.h"
|
||||
#include "tvgCanvasImpl.h"
|
||||
|
||||
|
@ -84,5 +81,3 @@ unique_ptr<SwCanvas> SwCanvas::gen() noexcept
|
|||
#endif
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
#endif /* _TVG_SWCANVAS_CPP_ */
|
||||
|
|
|
@ -365,4 +365,3 @@ const char* simpleXmlFindAttributesTag(const char* buf, unsigned bufLength)
|
|||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _TVG_SVG_LOADER_CPP_
|
||||
#define _TVG_SVG_LOADER_CPP_
|
||||
|
||||
#include <stddef.h>
|
||||
#include <fstream>
|
||||
#include "tvgSvgLoader.h"
|
||||
|
@ -2392,5 +2389,3 @@ unique_ptr<Scene> SvgLoader::data()
|
|||
{
|
||||
return move(root);
|
||||
}
|
||||
|
||||
#endif //_TVG_SVG_LOADER_CPP_
|
||||
|
|
|
@ -19,10 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef __TVG_SVG_PATH_CPP_
|
||||
#define __TVG_SVG_PATH_CPP_
|
||||
|
||||
#include "tvgSvgPath.h"
|
||||
|
||||
|
||||
|
@ -501,5 +497,3 @@ tuple<vector<PathCommand>, vector<Point>> svgPathToTvgPath(const char* svgPath)
|
|||
|
||||
return make_tuple(cmds, pts);
|
||||
}
|
||||
|
||||
#endif //__TVG_SVG_PATH_CPP_
|
||||
|
|
|
@ -19,11 +19,6 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef _TVG_SVG_SCENE_BUILDER_CPP_
|
||||
#define _TVG_SVG_SCENE_BUILDER_CPP_
|
||||
|
||||
|
||||
#include "tvgSvgSceneBuilder.h"
|
||||
|
||||
unique_ptr<LinearGradient> _applyLinearGradientProperty(SvgStyleGradient* g, Shape* vg, float rx, float ry, float rw, float rh)
|
||||
|
@ -375,6 +370,3 @@ unique_ptr<Scene> SvgSceneBuilder::build(SvgNode* node)
|
|||
preserveAspect = node->node.doc.preserveAspect;
|
||||
return _sceneBuildHelper(node, viewBox.x, viewBox.y, viewBox.w, viewBox.h, 255);
|
||||
}
|
||||
|
||||
|
||||
#endif //_TVG_SVG_SCENE_BUILDER_CPP_
|
||||
|
|
Loading…
Add table
Reference in a new issue