[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash libbase/jpeg.cpp ./ChangeLog plugin/klash...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash libbase/jpeg.cpp ./ChangeLog plugin/klash... |
Date: |
Tue, 25 Apr 2006 14:43:39 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/04/25 14:43:38
Modified files:
libbase : jpeg.cpp
. : ChangeLog
plugin/klash : Makefile.am klash_part.cpp
Added files:
plugin/klash : klash.cpp
Log message:
* libbase/jpeg.cpp: Add support for grayscale jpegs.
* plugin/klash/Makefile.am: Add klash executable.
* plugin/klash/klash.cpp: Build a KDE version of the standalone
player for Konqueror.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/jpeg.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.230&tr2=1.231&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/Makefile.am.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash_part.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.230 gnash/ChangeLog:1.231
--- gnash/ChangeLog:1.230 Mon Apr 24 23:46:43 2006
+++ gnash/ChangeLog Tue Apr 25 14:43:38 2006
@@ -1,3 +1,10 @@
+2006-04-25 Rob Savoye <address@hidden>
+
+ * libbase/jpeg.cpp: Add support for grayscale jpegs.
+ * plugin/klash/Makefile.am: Add klash executable.
+ * plugin/klash/klash.cpp: Build a KDE version of the standalone
+ player for Konqueror.
+
2006-04-25 Bastiaan Jacques <address@hidden>
* libbase/smart_ptr.h: Introduce noref_ptr, a smart pointer without
@@ -16,7 +23,7 @@
correctly.
* server/impl.cpp: Call read_jpeg() instead of read_swf_jpeg2().
-2006-04-23 Bastiaan Jacques <address@hidden>
+2006-04-23 Bastiaan Jacques <address@hidden>
* server/Movie.cpp, server/Movie.h, server/Object.h,
server/font.h, server/morph2.h, server/shape.h,
Index: gnash/libbase/jpeg.cpp
diff -u gnash/libbase/jpeg.cpp:1.5 gnash/libbase/jpeg.cpp:1.6
--- gnash/libbase/jpeg.cpp:1.5 Mon Apr 24 14:42:52 2006
+++ gnash/libbase/jpeg.cpp Tue Apr 25 14:43:38 2006
@@ -427,6 +427,19 @@
int lines_read = jpeg_read_scanlines(&m_cinfo,
&rgb_data, 1);
assert(lines_read == 1);
lines_read = lines_read; // avoid warning in
NDEBUG
+ // Expand grayscale to RGB
+ if (m_cinfo.out_color_space == JCS_GRAYSCALE)
+ {
+ int w = get_width();
+ unsigned char* src = rgb_data + w - 1;
+ unsigned char* dst = rgb_data + (w * 3) - 1;
+ for (; w; w--, src--)
+ {
+ *dst-- = *src;
+ *dst-- = *src;
+ *dst-- = *src;
+ }
+ }
}
};
Index: gnash/plugin/klash/Makefile.am
diff -u gnash/plugin/klash/Makefile.am:1.6 gnash/plugin/klash/Makefile.am:1.7
--- gnash/plugin/klash/Makefile.am:1.6 Mon Apr 24 23:05:56 2006
+++ gnash/plugin/klash/Makefile.am Tue Apr 25 14:43:38 2006
@@ -74,6 +74,50 @@
appsdatadir=$(kde_datadir)/klash
dist_appsdata_DATA= pluginsinfo
+AM_LDFLAGS = \
+ $(JPEG_LIBS) \
+ $(PNG_LIBS) \
+ $(OGG_LIBS) \
+ $(ZLIB_LIBS) \
+ $(LIBXML_LIBS) \
+ $(SDL_LIBS) \
+ $(SDL_MIXER_LIBS) \
+ $(X_LIBS) \
+ $(MP3_LIBS) \
+ $(PTHREAD_LIBS) \
+ $(LIB_KDEUI) \
+ $(LIB_KDECORE)
+
+
+INCLUDES = -I.. \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/server \
+ -I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libgeometry \
+ $(PTHREAD_CFLAGS) \
+ $(SDL_CFLAGS) \
+ $(SDL_MIXER_CFLAGS) \
+ $(LIBXML_CFLAGS) \
+ $(OPENGL_CFLAGS) \
+ $(PNG_CFLAGS) \
+ $(JPEG_CFLAGS) \
+ $(MP3_CFLAGS) \
+ $(OGG_CFLAGS)
+
+bin_PROGRAMS = klash
+
+klash_SOURCES = klash.cpp
+klash_LDFLAGS = -module -avoid-version -no-undefined #-Wl,-z,defs
+
+klash_LDADD = $(AM_LDFLAGS) \
+ ../../backend/libgnashbackend.la \
+ ../../server/libgnashserver.la \
+ ../../server/libgnashasobjs.la \
+ ../../libgeometry/libgnashgeo.la \
+ ../../libbase/libgnashbase.la
+
+
CLEANFILES = klash_part.moc
dummy.cpp:
echo > dummy.cpp
Index: gnash/plugin/klash/klash_part.cpp
diff -u gnash/plugin/klash/klash_part.cpp:1.4
gnash/plugin/klash/klash_part.cpp:1.5
--- gnash/plugin/klash/klash_part.cpp:1.4 Mon Apr 24 23:05:56 2006
+++ gnash/plugin/klash/klash_part.cpp Tue Apr 25 14:43:38 2006
@@ -183,7 +183,7 @@
if (m_width > 0 && m_height > 0)
dim = QString ("-j ") + QString::number (m_width) +
QString (" -k ") + QString::number (m_height);
- QString cmd = QString ("gnash -x ") +
+ QString cmd = QString ("klash -x ") +
QString::number (static_cast <KlashView *> (widget ())->embedId()) +
QChar (' ') + dim +
QChar (' ') + KProcess::quote (m_src_url);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash libbase/jpeg.cpp ./ChangeLog plugin/klash...,
Rob Savoye <=