From 83818b18a1fa1e8a00332489e31d346101b6fe9e Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 30 Mar 2015 20:56:31 +0200
Subject: Another massive cleanup

Drops unused functions, fixes function visibility.
---
 palettes.c | 71 ++------------------------------------------------------------
 1 file changed, 2 insertions(+), 69 deletions(-)

(limited to 'palettes.c')

diff --git a/palettes.c b/palettes.c
index 03b2c08..92ddc79 100644
--- a/palettes.c
+++ b/palettes.c
@@ -17,8 +17,9 @@
 */
 
 #include <assert.h>
+#include <string.h>
 
-#include "private.h"
+#include "math.h"
 #include "palettes.h"
 #include "rect.h"
 
@@ -207,73 +208,6 @@ double4 hsv2rgb(double4 hsv)
    return (double4) { rd, gd, bd, hsv[3] };
 }
 
-double flam3_calc_alpha(double density, double gamma, double linrange) {
-
-   double dnorm = density;
-   double funcval = pow(linrange, gamma);
-   double frac,alpha;
-   
-   if (dnorm>0) {
-      if (dnorm < linrange) {
-         frac = dnorm/linrange;
-         alpha = (1.0-frac) * dnorm * (funcval / linrange) + frac * pow(dnorm,gamma);
-      } else
-         alpha = pow(dnorm,gamma);
-   } else
-      alpha = 0;
-      
-   return(alpha);
-}
-          
-double4 flam3_calc_newrgb(double4 cbuf, double ls, double highpow) {
-
-   int rgbi;
-   double newls,lsratio;
-   double a, maxa=-1.0, maxc=0;
-   double adjhlp;
-   
-   if (ls==0.0 || (cbuf[0]==0.0 && cbuf[1]==0.0 && cbuf[2]==0.0)) {
-      return (double4) { 0, 0, 0, 0 };
-   }
-   
-   /* Identify the most saturated channel */
-   for (rgbi=0;rgbi<3;rgbi++) {
-      a = ls * (cbuf[rgbi]);
-      if (a>maxa) {
-         maxa = a;
-         maxc = cbuf[rgbi];
-      }
-   }
-      
-   /* If a channel is saturated and we have a non-negative highlight power */
-   /* modify the color to prevent hue shift                                */
-   if (maxa > 1.0 && highpow>=0.0) {
-      newls = 1.0/maxc;
-      lsratio = pow(newls/ls,highpow);
-
-      /* Calculate the max-value color (ranged 0 - 1) */
-	  double4 newrgb = newls*(cbuf);
-
-      /* Reduce saturation by the lsratio */
-      double4 newhsv = rgb2hsv(newrgb);
-      newhsv[1] *= lsratio;
-
-      return hsv2rgb(newhsv);
-   } else {
-      newls = 1.0/maxc;
-      adjhlp = -highpow;
-      if (adjhlp>1)
-         adjhlp=1;
-      if (maxa<=1.0)
-         adjhlp=1.0;
-
-	  /* Calculate the max-value color (ranged 0 - 1) interpolated with the old
-	   * behaviour */
-		
-      return ((1.0-adjhlp)*newls + adjhlp*ls)*(cbuf);
-   }
-}
-
 static int random_xform(flam3_genome *g, int excluded, randctx * const rc) {
    int ntries = 0;
    while (ntries++ < 100) {
@@ -284,7 +218,6 @@ static int random_xform(flam3_genome *g, int excluded, randctx * const rc) {
    return -1;
 }
 
-
 static double try_colors(flam3_genome *g, int color_resolution) {
     int *hist;
     int i, hits, res = color_resolution;
-- 
cgit v1.2.3