From 263974dee90854fbc802b149738fa6ec7ca6f765 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 19 Jun 2019 00:45:53 +0000
Subject: [PATCH] gdal: removed jpeg (collision issue)

git-svn-id: svn://ultimatepp.org/upp/trunk@13420 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 bazaar/plugin/gdal/gdal.cpp   | 2 +-
 bazaar/plugin/gdal/import.ext | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bazaar/plugin/gdal/gdal.cpp b/bazaar/plugin/gdal/gdal.cpp
index 29e98bf7c..c6ee87b16 100644
--- a/bazaar/plugin/gdal/gdal.cpp
+++ b/bazaar/plugin/gdal/gdal.cpp
@@ -310,7 +310,7 @@ bool Gdal::Open(const char *fn)
 		GDALRegister_MFF();
 		GDALRegister_HKV();
 //		GDALRegister_PNG();
-		GDALRegister_JPEG();
+//		GDALRegister_JPEG();
 //		GDALRegister_JPEG2000();
 //		GDALRegister_JP2KAK();
 		GDALRegister_MEM();
diff --git a/bazaar/plugin/gdal/import.ext b/bazaar/plugin/gdal/import.ext
index b72e02cf9..ba9206d7c 100644
--- a/bazaar/plugin/gdal/import.ext
+++ b/bazaar/plugin/gdal/import.ext
@@ -59,6 +59,7 @@ exclude
 	frmts/jpeg2000/*
 	frmts/kea/*
 	frmts/jpegls/*
+	frmts/jpeg/*
 	frmts/mrsid_lidar/*
 	frmts/msgn/*
 	frmts/mrsid/*