[clutter] Add a deprecated header for ClutterTexture
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Add a deprecated header for ClutterTexture
- Date: Mon, 27 Feb 2012 15:58:15 +0000 (UTC)
commit 45d61d795bcb401eb78d03d6009f51831be39027
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Mon Feb 27 15:44:38 2012 +0000
Add a deprecated header for ClutterTexture
clutter/Makefile.am | 1 +
clutter/clutter-deprecated.h | 1 +
clutter/clutter-texture.h | 11 --------
clutter/deprecated/clutter-texture.h | 48 ++++++++++++++++++++++++++++++++++
4 files changed, 50 insertions(+), 11 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 1781c1b..dc19b19 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -254,6 +254,7 @@ deprecated_h = \
$(srcdir)/deprecated/clutter-shader.h \
$(srcdir)/deprecated/clutter-stage-manager.h \
$(srcdir)/deprecated/clutter-stage.h \
+ $(srcdir)/deprecated/clutter-texture.h \
$(srcdir)/deprecated/clutter-timeline.h \
$(srcdir)/deprecated/clutter-timeout-pool.h \
$(NULL)
diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index 0cd81d0..3cc65c4 100644
--- a/clutter/clutter-deprecated.h
+++ b/clutter/clutter-deprecated.h
@@ -26,6 +26,7 @@
#include "deprecated/clutter-shader.h"
#include "deprecated/clutter-stage-manager.h"
#include "deprecated/clutter-stage.h"
+#include "deprecated/clutter-texture.h"
#include "deprecated/clutter-timeline.h"
#include "deprecated/clutter-timeout-pool.h"
diff --git a/clutter/clutter-texture.h b/clutter/clutter-texture.h
index 70f8ca3..690a8c1 100644
--- a/clutter/clutter-texture.h
+++ b/clutter/clutter-texture.h
@@ -127,9 +127,6 @@ ClutterActor * clutter_texture_new (void);
ClutterActor * clutter_texture_new_from_file (const gchar *filename,
GError **error);
-CLUTTER_DEPRECATED_FOR(ClutterOffscreenEffect)
-ClutterActor * clutter_texture_new_from_actor (ClutterActor *actor);
-
gboolean clutter_texture_set_from_file (ClutterTexture *texture,
const gchar *filename,
GError **error);
@@ -154,14 +151,6 @@ gboolean clutter_texture_set_area_from_rgb_data (ClutterTexture
ClutterTextureFlags flags,
GError **error);
-CLUTTER_DEPRECATED
-gboolean clutter_texture_set_from_yuv_data (ClutterTexture *texture,
- const guchar *data,
- gint width,
- gint height,
- ClutterTextureFlags flags,
- GError **error);
-
void clutter_texture_get_base_size (ClutterTexture *texture,
gint *width,
gint *height);
diff --git a/clutter/deprecated/clutter-texture.h b/clutter/deprecated/clutter-texture.h
new file mode 100644
index 0000000..b48b73a
--- /dev/null
+++ b/clutter/deprecated/clutter-texture.h
@@ -0,0 +1,48 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By Matthew Allum <mallum openedhand com>
+ *
+ * Copyright (C) 2006 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_TEXTURE_DEPRECATED_H__
+#define __CLUTTER_TEXTURE_DEPRECATED_H__
+
+#include <clutter/clutter-texture.h>
+
+G_BEGIN_DECLS
+
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterOffscreenEffect)
+ClutterActor * clutter_texture_new_from_actor (ClutterActor *actor);
+
+CLUTTER_DEPRECATED_IN_1_10
+gboolean clutter_texture_set_from_yuv_data (ClutterTexture *texture,
+ const guchar *data,
+ gint width,
+ gint height,
+ ClutterTextureFlags flags,
+ GError **error);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_TEXTURE_DEPRECATED_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]