[SCM] drc/master: Fix wrong commit.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Dec 21 22:49:25 UTC 2016


The following commit has been merged in the master branch:
commit b5f73032b72b2dee981df928548a064893de45d8
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Dec 21 23:49:15 2016 +0100

    Fix wrong commit.

diff --git a/debian/patches/02-spelling-errors.patch b/debian/patches/02-spelling-errors.patch
index 8c6a1c7..7dc4dae 100644
--- a/debian/patches/02-spelling-errors.patch
+++ b/debian/patches/02-spelling-errors.patch
@@ -1,6 +1,6 @@
 Description: Fix spelling errors.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: Denis Sbragion <d.sbragion at infotecna.it>
+Forwarded: yes
 
 ---
  source/baselib.cpp |   14 +++++++-------
@@ -81,15 +81,15 @@ Index: drc/source/drc.cpp
  
  				d.sbragion at infotecna.it
  
--		This program uses the FFT  routines from  Takuya Ooura and the GNU
--		Scientific  Library (GSL).  Many thanks  to Takuya Ooura and the GSL
+-		This program uses the FFT  routines from  Takuya Ooura and the GNU
+-		Scientific  Library (GSL).  Many thanks  to Takuya Ooura and the GSL
 +		This program uses the FFT  routines from  Takuya Ooura and the GNU
 +		Scientific  Library (GSL).  Many thanks  to Takuya Ooura and the GSL
  		developers for these efficient routines.
  
  ****************************************************************************/
  
--/* Main file */
+-/* Main file */
 +/* Main file */
  
  /* Inclusioni */
@@ -98,16 +98,16 @@ Index: drc/source/drc.cpp
  #include <stdlib.h>
  #include <string.h>
  #include <time.h>
--#include <fenv.h>
+-#include <fenv.h>
 +#include <fenv.h>
  
  /* Versione corrente */
  #define DRCVersion "3.2.1"
--#define DRCCopyright "2002-2012"
--
--/* Memory leaks debugger */
--#ifdef DebugMLeaks
--	#include "debug_new.h"
+-#define DRCCopyright "2002-2012"
+-
+-/* Memory leaks debugger */
+-#ifdef DebugMLeaks
+-	#include "debug_new.h"
 +#define DRCCopyright "2002-2012"
 +
 +/* Memory leaks debugger */
@@ -129,8 +129,8 @@ Index: drc/source/drc.cpp
  
  		/* I386 Debug only, enables all floating point exceptions traps */
  		/* int em = 0x372;
--		__asm__ ("fldcw %0" : : "m" (em)); */
--
+-		__asm__ ("fldcw %0" : : "m" (em)); */
+-
 +		__asm__ ("fldcw %0" : : "m" (em)); */
 +
  		/* Messaggio iniziale */
@@ -140,10 +140,10 @@ Index: drc/source/drc.cpp
  		if (CfgParse(DRCFile,CfgParmsDef,CfgSimple) <= 0)
  			{
  				/* Dealloca le informazioni parsing command line */
--				FreeCmdLine(OptData, CfgParmsDef);
+-				FreeCmdLine(OptData, CfgParmsDef);
 +				FreeCmdLine(OptData, CfgParmsDef);
  				CfgFree(CfgParmsDef);
--
+-
 +
  				sputs(CfgGetLastErrorDsc());
  				sputs("Configuration file parsing error.");
@@ -152,7 +152,7 @@ Index: drc/source/drc.cpp
  		if (SetupDRCCfgBaseDir(&Cfg,CfgParmsDef,OptData) > 0)
  			{
  				/* Dealloca le informazioni parsing command line */
--				FreeCmdLine(OptData, CfgParmsDef);
+-				FreeCmdLine(OptData, CfgParmsDef);
 +				FreeCmdLine(OptData, CfgParmsDef);
  				CfgFree(CfgParmsDef);
  
@@ -170,14 +170,14 @@ Index: drc/source/drc.cpp
            OInSig[I] = MCOutSig[J];
  			}
  
--    /* Calcola il valore RMS del segnale in ingresso */
+-    /* Calcola il valore RMS del segnale in ingresso */
 +    /* Calcola il valore RMS del segnale in ingresso */
  		SRMSValue = GetRMSLevel(OInSig,MCOutSigLen);
  		if (SRMSValue > ((DLReal) 0.0))
  			printf("Input signal RMS level %f (%f dB).\n",(double) SRMSValue, (double) (20 * log10((double) SRMSValue)));
  		else
  			printf("Input signal RMS level %f (-Inf dB).\n",(double) SRMSValue);
--		fflush(stdout);
+-		fflush(stdout);
 +		fflush(stdout);
  
      /*********************************************************************************/
@@ -186,7 +186,7 @@ Index: drc/source/drc.cpp
  				switch (Cfg.BCDLType[0])
  					{
  						/* Fase lineare */
--						case 'L':
+-						case 'L':
 +						case 'L':
  						case 'P':
  							sputs("Input signal linear phase dip limiting...");
@@ -195,7 +195,7 @@ Index: drc/source/drc.cpp
  						break;
  
  						/* Fase minima */
--						case 'M':
+-						case 'M':
 +						case 'M':
  						case 'W':
  							sputs("Input signal minimum phase dip limiting...");
@@ -240,7 +240,7 @@ Index: drc/source/drc.cpp
  				switch (Cfg.DLType[0])
  					{
  						/* Fase lineare */
--						case 'L':
+-						case 'L':
 +						case 'L':
  						case 'P':
  							sputs("MP signal linear phase dip limiting...");
@@ -249,7 +249,7 @@ Index: drc/source/drc.cpp
  						break;
  
  						/* Fase minima */
--						case 'M':
+-						case 'M':
 +						case 'M':
  						case 'W':
  							sputs("MP signal minimum phase dip limiting...");
@@ -294,7 +294,7 @@ Index: drc/source/drc.cpp
  						switch (Cfg.PTDLType[0])
  							{
  								/* Fase lineare */
--								case 'L':
+-								case 'L':
 +								case 'L':
  								case 'P':
  									sputs("Target reference signal linear phase dip limiting...");
@@ -303,7 +303,7 @@ Index: drc/source/drc.cpp
  								break;
  
  								/* Fase minima */
--								case 'M':
+-								case 'M':
 +								case 'M':
  								case 'W':
  									sputs("Target reference minimum phase dip limiting...");
@@ -312,7 +312,7 @@ Index: drc/source/drc.cpp
  				switch (Cfg.PLType[0])
  					{
  						/* Fase lineare */
--						case 'L':
+-						case 'L':
 +						case 'L':
  						case 'P':
  							sputs("Linear phase peak limiting...");
@@ -321,7 +321,7 @@ Index: drc/source/drc.cpp
  						break;
  
  						/* Fase minima */
--						case 'M':
+-						case 'M':
 +						case 'M':
  						case 'W':
  							sputs("Minimum phase peak limiting...");

-- 
drc packaging



More information about the pkg-multimedia-commits mailing list