robot/JPEGDecoder
1
0
Fork 0
mirror of https://github.com/Bodmer/JPEGDecoder.git synced 2025-08-06 14:22:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid errors when SdFat used

Browse Source 
Allow #define LOAD_SD_LIBRARY to be commented out when using SdFat
This commit is contained in:
Bodmer
2017-04-05 21:46:04 +01:00
parent 4f1afdc391
commit 467cefa4d7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library.json
View File

@ -1,6 +1,6 @@
{
"name": "JPEGDecoder",
"version": "1.7.4",
"version": "1.7.5",
"keywords": "jpeg, jpg, decoder, TFT",
"description": "A JPEG decoder library, tested on Mega, Due and ESP8266",
"repository":

2
library.properties
View File

@ -1,5 +1,5 @@
name=JPEGDecoder
version=1.7.4
version=1.7.5
author=Bodmer <bodmer@anola.net>, Makoto Kurauchi, Rich Geldreich
maintainer=Bodmer
sentence= Jpeg decoder tested with Arduino Mega, Arduino Due and ESP8266 based NodeMCU 1.0

4
src/JPEGDecoder.h
View File

@ -75,7 +75,7 @@ typedef unsigned int uint;
class JPEGDecoder {
private:
#ifdef LOAD_SD_LIBRARY
#if defined (LOAD_SD_LIBRARY) || defined (LOAD_SDFAT_LIBRARY)
File g_pInFileSd;
#endif
#ifdef LOAD_SPIFFS
@ -126,7 +126,7 @@ public:
int decodeFile (const char *pFilename);
int decodeFile (const String& pFilename);
#ifdef LOAD_SD_LIBRARY
#if defined (LOAD_SD_LIBRARY) || defined (LOAD_SDFAT_LIBRARY)
int decodeSdFile (const char *pFilename);
int decodeSdFile (const String& pFilename);
int decodeSdFile (File g_pInFile);