From 0be613109e5af03a37dd47348576130f028a9a8e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 21 Jan 2009 16:41:18 +0000 Subject: [PATCH] [docs] Remove sources of warnings in API references --- clutter/cogl/cogl-texture.h | 2 +- clutter/cogl/cogl-vertex-buffer.h | 4 +-- doc/reference/clutter/clutter-sections.txt | 18 ++--------- doc/reference/cogl/cogl-docs.sgml | 2 +- doc/reference/cogl/cogl-sections.txt | 50 ++++++++++++++++++++---------- 5 files changed, 40 insertions(+), 36 deletions(-) diff --git a/clutter/cogl/cogl-texture.h b/clutter/cogl/cogl-texture.h index 893e167..d23ead6 100644 --- a/clutter/cogl/cogl-texture.h +++ b/clutter/cogl/cogl-texture.h @@ -142,7 +142,7 @@ CoglHandle cogl_texture_new_from_foreign (GLuint gl_handle, /** * cogl_texture_new_from_bitmap: - * @handle: handle of the preloaded texture + * @bitmap: a #CoglBitmap * @max_waste: maximum extra horizontal and|or vertical margin pixels * to make the texture fit GPU limitations * @flags: Optional flags for the texture, or %COGL_TEXTURE_NONE diff --git a/clutter/cogl/cogl-vertex-buffer.h b/clutter/cogl/cogl-vertex-buffer.h index 5bf8588..73b51e8 100644 --- a/clutter/cogl/cogl-vertex-buffer.h +++ b/clutter/cogl/cogl-vertex-buffer.h @@ -261,8 +261,8 @@ cogl_vertex_buffer_draw (CoglHandle handle, * @min_index: Specifies the minimum vertex index contained in indices * @max_index: Specifies the maximum vertex index contained in indices * @count: Specifies the number of vertices you want to draw. - * @indices_typetype: Specifies the data type used for the indices, and must be - * one of: + * @indices_type: Specifies the data type used for the indices, and must be + * one of: * * GL_UNSIGNED_BYTE * GL_UNSIGNED_SHORT diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt index 735d41f..f6fb673 100644 --- a/doc/reference/clutter/clutter-sections.txt +++ b/doc/reference/clutter/clutter-sections.txt @@ -48,7 +48,6 @@ CLUTTER_UNITS_FROM_PARENT_HEIGHT_PERCENTAGE CLUTTER_UNITS_FROM_MM CLUTTER_UNITS_FROM_MMX CLUTTER_UNITS_FROM_POINTS -CLUTTER_UNITS_FROM_POINTSX CLUTTER_MAXUNIT @@ -923,7 +922,6 @@ clutter_feature_get_all clutter-fixed Fixed Point Support ClutterFixed -CFX_Q CFX_ONE CFX_HALF CFX_MAX @@ -957,23 +955,13 @@ CLUTTER_ANGLE_TO_DEG CLUTTER_ANGLE_TO_DEGX CLUTTER_ANGLE_MAX_DEG CFX_RADIANS_TO_DEGREES -clutter_cosi clutter_cosx -clutter_sini clutter_sinx -CLUTTER_SQRTI_ARG_10_PERCENT -CLUTTER_SQRTI_ARG_5_PERCENT -CLUTTER_SQRTI_ARG_MAX -clutter_sqrti -clutter_sqrtx -clutter_log2x -clutter_pow2x -clutter_powx +clutter_tanx +clutter_atanx +clutter_atan2x clutter_qmulx clutter_qdivx -clutter_tani -clutter_atani -clutter_atan2i CLUTTER_MAXFIXED diff --git a/doc/reference/cogl/cogl-docs.sgml b/doc/reference/cogl/cogl-docs.sgml index a7b433c..56e6bc8 100644 --- a/doc/reference/cogl/cogl-docs.sgml +++ b/doc/reference/cogl/cogl-docs.sgml @@ -60,7 +60,7 @@ - + diff --git a/doc/reference/cogl/cogl-sections.txt b/doc/reference/cogl/cogl-sections.txt index e76c5cf..cf3329f 100644 --- a/doc/reference/cogl/cogl-sections.txt +++ b/doc/reference/cogl/cogl-sections.txt @@ -23,11 +23,10 @@ cogl_get_viewport cogl_push_matrix cogl_pop_matrix cogl_scale -cogl_translatex cogl_translate -cogl_rotatex cogl_rotate +CoglClipStackState cogl_clip_set cogl_clip_set_from_path cogl_clip_set_from_path_preserve @@ -90,10 +89,10 @@ cogl_path_stroke_preserve cogl_set_source_color cogl_set_source_color4ub cogl_set_source_color4f +cogl_color cogl_rectangle -cogl_rectanglex
@@ -105,7 +104,12 @@ cogl_texture_new_with_size cogl_texture_new_from_file cogl_texture_new_from_data cogl_texture_new_from_foreign +cogl_texture_new_from_bitmap cogl_is_texture +cogl_texture_ref +cogl_texture_unref + + cogl_texture_get_width cogl_texture_get_height cogl_texture_get_format @@ -118,11 +122,18 @@ cogl_texture_get_gl_texture cogl_texture_get_data cogl_texture_set_filters cogl_texture_set_region -cogl_texture_ref -cogl_texture_unref + + cogl_texture_rectangle cogl_texture_multiple_rectangles cogl_texture_polygon + + +CoglBitmap +cogl_bitmap_new_from_file +cogl_bitmap_free +cogl_bitmap_get_size_from_file +
@@ -146,6 +157,7 @@ cogl_program_link cogl_program_use cogl_program_get_uniform_location cogl_program_uniform_1f +cogl_program_uniform_1i cogl_program_uniform_float cogl_program_uniform_int cogl_program_uniform_matrix @@ -229,6 +241,7 @@ cogl_fixed_pow cogl_fixed_pow2 cogl_fixed_sin cogl_fixed_sqrt +cogl_fixed_tan CoglAngle @@ -280,17 +293,20 @@ cogl_color_get_alpha_float
-cogl-attributes-buffer -Attributes Buffer API -cogl_attributes_buffer_new -cogl_attributes_buffer_ref -cogl_attributes_buffer_unref -cogl_attributes_buffer_add -cogl_attributes_buffer_delete -cogl_attributes_buffer_enable -cogl_attributes_buffer_disable -cogl_attributes_buffer_submit -cogl_attributes_buffer_draw -cogl_attributes_buffer_draw_range_elements +cogl-vertex-buffer +Vertex Buffers +CoglVertexBufferAttribFlags +COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_MASK +COGL_VERTEX_BUFFER_ATTRIB_FLAG_TYPE_MASK +cogl_vertex_buffer_new +cogl_vertex_buffer_ref +cogl_vertex_buffer_unref +cogl_vertex_buffer_add +cogl_vertex_buffer_delete +cogl_vertex_buffer_enable +cogl_vertex_buffer_disable +cogl_vertex_buffer_submit +cogl_vertex_buffer_draw +cogl_vertex_buffer_draw_range_elements
-- 2.7.4