From ebc2d66e4189e555767c45341427ee2f43099137 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 16 Jul 2018 19:40:30 -0400 Subject: [PATCH] Remove unused code. --- src/_image.cpp | 57 ---------------------- src/_image.h | 2 - src/ft2font.cpp | 1 - src/path_cleanup.cpp | 113 ------------------------------------------- src/path_cleanup.h | 27 ----------- 5 files changed, 200 deletions(-) delete mode 100644 src/path_cleanup.cpp delete mode 100644 src/path_cleanup.h diff --git a/src/_image.cpp b/src/_image.cpp index 2ba9adca2887..28e509a4a445 100644 --- a/src/_image.cpp +++ b/src/_image.cpp @@ -116,60 +116,3 @@ void _bin_indices(int *irows, int nrows, const double *y, unsigned long ny, doub } } } - -void _bin_indices_linear( - float *arows, int *irows, int nrows, double *y, unsigned long ny, double sc, double offs) -{ - int i; - if (sc * (y[ny - 1] - y[0]) > 0) { - int ii = 0; - int iilast = (int)ny - 1; - int iy0 = (int)floor(sc * (y[ii] - offs)); - int iy1 = (int)floor(sc * (y[ii + 1] - offs)); - float invgap = 1.0f / (iy1 - iy0); - for (i = 0; i < nrows && i < iy0; i++) { - irows[i] = -1; - } - for (; i < nrows; i++) { - while (i > iy1 && ii < iilast) { - ii++; - iy0 = iy1; - iy1 = (int)floor(sc * (y[ii + 1] - offs)); - invgap = 1.0f / (iy1 - iy0); - } - if (i >= iy0 && i <= iy1) { - irows[i] = ii; - arows[i] = (iy1 - i) * invgap; - } else - break; - } - for (; i < nrows; i++) { - irows[i] = -1; - } - } else { - int iilast = (int)ny - 1; - int ii = iilast; - int iy0 = (int)floor(sc * (y[ii] - offs)); - int iy1 = (int)floor(sc * (y[ii - 1] - offs)); - float invgap = 1.0f / (iy1 - iy0); - for (i = 0; i < nrows && i < iy0; i++) { - irows[i] = -1; - } - for (; i < nrows; i++) { - while (i > iy1 && ii > 1) { - ii--; - iy0 = iy1; - iy1 = (int)floor(sc * (y[ii - 1] - offs)); - invgap = 1.0f / (iy1 - iy0); - } - if (i >= iy0 && i <= iy1) { - irows[i] = ii - 1; - arows[i] = (i - iy0) * invgap; - } else - break; - } - for (; i < nrows; i++) { - irows[i] = -1; - } - } -} diff --git a/src/_image.h b/src/_image.h index 08b697b9b10a..37a080fff1d4 100644 --- a/src/_image.h +++ b/src/_image.h @@ -21,8 +21,6 @@ void _bin_indices_middle_linear(float *arows, float dy, float y_min); void _bin_indices(int *irows, int nrows, const double *y, unsigned long ny, double sc, double offs); -void _bin_indices_linear( - float *arows, int *irows, int nrows, double *y, unsigned long ny, double sc, double offs); template void pcolor(CoordinateArray &x, diff --git a/src/ft2font.cpp b/src/ft2font.cpp index ef622b2e9cac..e2fc3b818193 100644 --- a/src/ft2font.cpp +++ b/src/ft2font.cpp @@ -606,7 +606,6 @@ void FT2Font::set_text( bbox.xMax = bbox.yMax = -32000; for (unsigned int n = 0; n < N; n++) { - std::string thischar("?"); FT_UInt glyph_index; FT_BBox glyph_bbox; FT_Pos last_advance; diff --git a/src/path_cleanup.cpp b/src/path_cleanup.cpp deleted file mode 100644 index f9f2213b3d7f..000000000000 --- a/src/path_cleanup.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- mode: c++; c-basic-offset: 4 -*- */ - -#include -#define NO_IMPORT_ARRAY -#include "numpy/arrayobject.h" - -#include "py_converters.h" - -#include "py_adaptors.h" -#include "agg_conv_transform.h" -#include "path_converters.h" - -class PathCleanupIterator -{ - typedef agg::conv_transform transformed_path_t; - typedef PathNanRemover nan_removal_t; - typedef PathClipper clipped_t; - typedef PathSnapper snapped_t; - typedef PathSimplifier simplify_t; - typedef Sketch sketch_t; - - py::PathIterator m_path_iter; - agg::trans_affine m_transform; - transformed_path_t m_transformed; - nan_removal_t m_nan_removed; - clipped_t m_clipped; - snapped_t m_snapped; - simplify_t m_simplify; - sketch_t m_sketch; - - public: - PathCleanupIterator(PyObject *path, - agg::trans_affine trans, - bool remove_nans, - bool do_clip, - const agg::rect_base &rect, - e_snap_mode snap_mode, - double stroke_width, - bool do_simplify, - double sketch_scale, - double sketch_length, - double sketch_randomness) - : m_transform(trans), - m_transformed(m_path_iter, m_transform), - m_nan_removed(m_transformed, remove_nans, m_path_iter.has_curves()), - m_clipped(m_nan_removed, do_clip && !m_path_iter.has_curves(), rect), - m_snapped(m_clipped, snap_mode, m_path_iter.total_vertices(), stroke_width), - m_simplify(m_snapped, - do_simplify && m_path_iter.should_simplify(), - m_path_iter.simplify_threshold()), - m_sketch(m_simplify, sketch_scale, sketch_length, sketch_randomness) - { - convert_path(path, &m_path_iter); - - Py_INCREF(path); - m_path_iter.rewind(0); - } - - unsigned vertex(double *x, double *y) - { - return m_simplify.vertex(x, y); - } -}; - -extern "C" { -void *get_path_iterator(PyObject *path, - PyObject *trans, - int remove_nans, - int do_clip, - double rect[4], - e_snap_mode snap_mode, - double stroke_width, - int do_simplify, - double sketch_scale, - double sketch_length, - double sketch_randomness) -{ - agg::trans_affine agg_trans; - if (!convert_trans_affine(trans, &agg_trans)) { - return NULL; - } - agg::rect_base clip_rect(rect[0], rect[1], rect[2], rect[3]); - - PathCleanupIterator *pipeline = new PathCleanupIterator(path, - agg_trans, - remove_nans != 0, - do_clip != 0, - clip_rect, - snap_mode, - stroke_width, - do_simplify != 0, - sketch_scale, - sketch_length, - sketch_randomness); - - return (void *)pipeline; -} - -unsigned get_vertex(void *pipeline, double *x, double *y) -{ - PathCleanupIterator *pipeline_iter = (PathCleanupIterator *)pipeline; - - unsigned code = pipeline_iter->vertex(x, y); - return code; -} - -void free_path_iterator(void *pipeline) -{ - PathCleanupIterator *pipeline_iter = (PathCleanupIterator *)pipeline; - - delete pipeline_iter; -} -} diff --git a/src/path_cleanup.h b/src/path_cleanup.h deleted file mode 100644 index bf69afd35dba..000000000000 --- a/src/path_cleanup.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- mode: c++; c-basic-offset: 4 -*- */ - -#ifndef MPL_PATH_CLEANUP_H -#define MPL_PATH_CLEANUP_H - -#include - -enum e_snap_mode { - SNAP_AUTO, - SNAP_FALSE, - SNAP_TRUE -}; - -void *get_path_iterator(PyObject *path, - PyObject *trans, - int remove_nans, - int do_clip, - double rect[4], - enum e_snap_mode snap_mode, - double stroke_width, - int do_simplify); - -unsigned get_vertex(void *pipeline, double *x, double *y); - -void free_path_iterator(void *pipeline); - -#endif /* MPL_PATH_CLEANUP_H */