Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

1 files changed, 50 insertions, 0 deletions

diff --git a/tdehtml/misc/loader_jpeg.h b/tdehtml/misc/loader_jpeg.h
new file mode 100644
index 000000000..568a29d44
--- /dev/null
+++ b/tdehtml/misc/loader_jpeg.h
@@ -0,0 +1,50 @@
+/*
+    This file is part of the KDE libraries
+
+    Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+    AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    This is a helper for progressive loading of JPEG's. 
+*/
+
+#ifndef _tdehtml_loader_jpeg_h
+#define _tdehtml_loader_jpeg_h
+
+#include <tqasyncimageio.h>
+
+namespace tdehtml
+{
+    /**
+     * @internal
+     *
+     * An incremental loader factory for JPEG's.
+     */
+    class KJPEGFormatType : public TQImageFormatType
+    {
+    public:
+        TQImageFormat* decoderFor(const uchar* buffer, int length);
+        const char* formatName() const;
+    };
+
+}
+
+
+// -----------------------------------------------------------------------------
+
+#endif // _tdehtml_loader_jpeg_h