From 25506791a6362868151b4f90e2f1ce3ff1be7a49 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 23 Sep 2013 16:40:48 +0800 Subject: [PATCH] reorganize poppler files --- .../poppler}/0.22.5/CairoFontEngine.cc | 0 .../poppler}/0.22.5/CairoFontEngine.h | 0 .../poppler}/0.22.5/CairoOutputDev.cc | 0 .../poppler}/0.22.5/CairoOutputDev.h | 0 .../poppler}/0.22.5/CairoRescaleBox.cc | 0 .../poppler}/0.22.5/CairoRescaleBox.h | 0 .../poppler}/git/CairoFontEngine.cc | 0 .../CairoOutputDev => 3rdparty/poppler}/git/CairoFontEngine.h | 0 .../CairoOutputDev => 3rdparty/poppler}/git/CairoOutputDev.cc | 0 .../CairoOutputDev => 3rdparty/poppler}/git/CairoOutputDev.h | 0 .../poppler}/git/CairoRescaleBox.cc | 0 .../CairoOutputDev => 3rdparty/poppler}/git/CairoRescaleBox.h | 0 CMakeLists.txt | 4 ++-- 13 files changed, 2 insertions(+), 2 deletions(-) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/0.22.5/CairoFontEngine.cc (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/0.22.5/CairoFontEngine.h (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/0.22.5/CairoOutputDev.cc (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/0.22.5/CairoOutputDev.h (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/0.22.5/CairoRescaleBox.cc (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/0.22.5/CairoRescaleBox.h (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/git/CairoFontEngine.cc (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/git/CairoFontEngine.h (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/git/CairoOutputDev.cc (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/git/CairoOutputDev.h (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/git/CairoRescaleBox.cc (100%) rename {src/BackgroundRenderer/CairoOutputDev => 3rdparty/poppler}/git/CairoRescaleBox.h (100%) diff --git a/src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoFontEngine.cc b/3rdparty/poppler/0.22.5/CairoFontEngine.cc similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoFontEngine.cc rename to 3rdparty/poppler/0.22.5/CairoFontEngine.cc diff --git a/src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoFontEngine.h b/3rdparty/poppler/0.22.5/CairoFontEngine.h similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoFontEngine.h rename to 3rdparty/poppler/0.22.5/CairoFontEngine.h diff --git a/src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoOutputDev.cc b/3rdparty/poppler/0.22.5/CairoOutputDev.cc similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoOutputDev.cc rename to 3rdparty/poppler/0.22.5/CairoOutputDev.cc diff --git a/src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoOutputDev.h b/3rdparty/poppler/0.22.5/CairoOutputDev.h similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoOutputDev.h rename to 3rdparty/poppler/0.22.5/CairoOutputDev.h diff --git a/src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoRescaleBox.cc b/3rdparty/poppler/0.22.5/CairoRescaleBox.cc similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoRescaleBox.cc rename to 3rdparty/poppler/0.22.5/CairoRescaleBox.cc diff --git a/src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoRescaleBox.h b/3rdparty/poppler/0.22.5/CairoRescaleBox.h similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/0.22.5/CairoRescaleBox.h rename to 3rdparty/poppler/0.22.5/CairoRescaleBox.h diff --git a/src/BackgroundRenderer/CairoOutputDev/git/CairoFontEngine.cc b/3rdparty/poppler/git/CairoFontEngine.cc similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/git/CairoFontEngine.cc rename to 3rdparty/poppler/git/CairoFontEngine.cc diff --git a/src/BackgroundRenderer/CairoOutputDev/git/CairoFontEngine.h b/3rdparty/poppler/git/CairoFontEngine.h similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/git/CairoFontEngine.h rename to 3rdparty/poppler/git/CairoFontEngine.h diff --git a/src/BackgroundRenderer/CairoOutputDev/git/CairoOutputDev.cc b/3rdparty/poppler/git/CairoOutputDev.cc similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/git/CairoOutputDev.cc rename to 3rdparty/poppler/git/CairoOutputDev.cc diff --git a/src/BackgroundRenderer/CairoOutputDev/git/CairoOutputDev.h b/3rdparty/poppler/git/CairoOutputDev.h similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/git/CairoOutputDev.h rename to 3rdparty/poppler/git/CairoOutputDev.h diff --git a/src/BackgroundRenderer/CairoOutputDev/git/CairoRescaleBox.cc b/3rdparty/poppler/git/CairoRescaleBox.cc similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/git/CairoRescaleBox.cc rename to 3rdparty/poppler/git/CairoRescaleBox.cc diff --git a/src/BackgroundRenderer/CairoOutputDev/git/CairoRescaleBox.h b/3rdparty/poppler/git/CairoRescaleBox.h similarity index 100% rename from src/BackgroundRenderer/CairoOutputDev/git/CairoRescaleBox.h rename to 3rdparty/poppler/git/CairoRescaleBox.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 90e5f6a..78213ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,9 +38,9 @@ if(ENABLE_SVG) set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${CAIRO_LIBRARIES}) set(ENABLE_SVG 1) if(POPPLER_OLDER_THAN_0_23_0) - set(CAIROOUTPUTDEV_PATH src/BackgroundRenderer/CairoOutputDev/0.22.5) + set(CAIROOUTPUTDEV_PATH 3rdparty/poppler/0.22.5) else() - set(CAIROOUTPUTDEV_PATH src/BackgroundRenderer/CairoOutputDev/git) + set(CAIROOUTPUTDEV_PATH 3rdparty/poppler/git) endif() include_directories(${CAIROOUTPUTDEV_PATH}) set(PDF2HTMLEX_SRC ${PDF2HTMLEX_SRC}