From 9944e6b08d38eeb77544e78e663b7c8bae691086 Mon Sep 17 00:00:00 2001 From: Matteo Paonessa Date: Thu, 15 Dec 2016 21:30:14 +0100 Subject: [PATCH] Header does not depend on turbojpeg anymore --- .gitignore | 47 ++++++++++++++++++++++++++++++++++++++++++++++- caesium/caesium.h | 3 +-- demo/helper.c | 1 + 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index efb4f5f..7126a30 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,49 @@ .idea/* # Build -build \ No newline at end of file +cmake-build-* +build + +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml + +# Sensitive or high-churn files: +.idea/dataSources/ +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries + +# Mongo Explorer plugin: +.idea/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties diff --git a/caesium/caesium.h b/caesium/caesium.h index ead7c80..2744a23 100644 --- a/caesium/caesium.h +++ b/caesium/caesium.h @@ -2,7 +2,6 @@ #define LIBCAESIUM_CAESIUM_H #include -#include typedef struct cs_jpeg_pars { @@ -14,7 +13,7 @@ typedef struct cs_jpeg_pars * overwritten during the process */ int color_space; - enum TJSAMP subsample; + int subsample; int width; int height; } cs_jpeg_pars; diff --git a/demo/helper.c b/demo/helper.c index 9cf4b0b..a7b7442 100644 --- a/demo/helper.c +++ b/demo/helper.c @@ -1,4 +1,5 @@ #include +#include #include "helper.h"