Replaced vout_InitPicture/Format with their equivalent.

[vlc] / modules / visualization / galaktos / per_pixel_eqn.c

diff --git a/modules/visualization/galaktos/per_pixel_eqn.c b/modules/visualization/galaktos/per_pixel_eqn.c
index 0be34f1fe5caadddea04e9b0c117b330115a8df9..3cd0c016aacfeb09ab5d7bdfcca84c0a12654012 100644 (file)
--- a/modules/visualization/galaktos/per_pixel_eqn.c
+++ b/modules/visualization/galaktos/per_pixel_eqn.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * per_pixel_eqn.c:
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  * $Id$
  *
  * Authors: Cyril Deguet <asmax@videolan.org>
@@ -19,11 +19,9 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -54,7 +52,7 @@ extern int mesh_j;
 
 
 /* Evaluates a per pixel equation */
-inline void evalPerPixelEqn(per_pixel_eqn_t * per_pixel_eqn) {
+void evalPerPixelEqn(per_pixel_eqn_t * per_pixel_eqn) {
 
   double ** param_matrix = NULL;
   gen_expr_t * eqn_ptr = NULL;
@@ -96,7 +94,7 @@ inline void evalPerPixelEqn(per_pixel_eqn_t * per_pixel_eqn) {
   per_pixel_eqn->param->matrix_flag = 1; 
 }
 
-inline void evalPerPixelEqns() {
+void evalPerPixelEqns() {
 
   /* Evaluate all per pixel equations using splay traversal */
   splay_traverse(evalPerPixelEqn, active_preset->per_pixel_eqn_tree);
@@ -213,13 +211,7 @@ void free_per_pixel_eqn(per_pixel_eqn_t * per_pixel_eqn) {
        return;
 }
 
-inline int isPerPixelEqn(int op) {
-    
-  return active_preset->per_pixel_flag[op];
-
-}
-
-inline int resetPerPixelEqnFlags(preset_t * preset) {
+static inline int resetPerPixelEqnFlags(preset_t * preset) {
   int i;
 
   for (i = 0; i < NUM_OPS;i++)