Inline combine_two_samples (and remove an obsolete assert). Helps 13–14% on ResampleE...

[movit] / widgets.h

diff --git a/widgets.h b/widgets.h
index d7c3c5e8f27d500ab392dbf02b07b402d0b9e799..ddf997ccc3323c55264d86afbee0a73001555a74 100644 (file)
--- a/widgets.h
+++ b/widgets.h
@@ -1,11 +1,16 @@
-#ifndef _WIDGETS_H
-#define _WIDGETS_H 1
+#ifndef _MOVIT_WIDGETS_H
+#define _MOVIT_WIDGETS_H 1
 
 // Some simple UI widgets for test use.
 
+namespace movit {
+
 void draw_hsv_wheel(float y, float rad, float theta, float value);
 void draw_saturation_bar(float y, float saturation);
-void make_hsv_wheel_texture();
+void init_hsv_resources();
+void cleanup_hsv_resources();
 void read_colorwheel(float xf, float yf, float *rad, float *theta, float *value);
 
-#endif // !defined(_WIDGETS_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_WIDGETS_H)