/packages/sysutils/par2cmdline/patches/par2cmdline-0.4-gcc4.patch

http://github.com/OpenELEC/OpenELEC.tv · Patch · 62 lines · 49 code · 13 blank · 0 comment · 0 complexity · d52515669d3bc43f19c545fd6405dacc MD5 · raw file 

    

  1. Fix compilation with gcc-4.
    2. 

  2. 

  3. Patch by Dirk-Jan Heijs.
    4. 

  4. 

  5. http://bugs.gentoo.org/102391
    6. 

  6. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=287904
    7. 

  7. 

  8. --- par2cmdline-0.4/reedsolomon.cpp
    9. 

  9. +++ par2cmdline-0.4/reedsolomon.cpp
    10. 

  10. @@ -51,7 +51,7 @@
    11. 

  11.    }
    12. 

  12.  }
    13. 

  13.  
    14. 

  14. -bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
    15. 

  15. +template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
    16. 

  16.  {
    17. 

  17.    inputcount = (u32)present.size();
    18. 

  18.  
    19. 

  19. @@ -80,7 +80,7 @@
    20. 

  20.    return true;
    21. 

  21.  }
    22. 

  22.  
    23. 

  23. -bool ReedSolomon<Galois8>::SetInput(u32 count)
    24. 

  24. +template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
    25. 

  25.  {
    26. 

  26.    inputcount = count;
    27. 

  27.  
    28. 

  28. @@ -101,7 +101,7 @@
    29. 

  29.    return true;
    30. 

  30.  }
    31. 

  31.  
    32. 

  32. -bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
    33. 

  33. +template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
    34. 

  34.  {
    35. 

  35.    // Look up the appropriate element in the RS matrix
    36. 

  36.    Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex];
    37. 

  37. @@ -189,7 +189,7 @@
    38. 

  38.  
    39. 

  39.  // Set which of the source files are present and which are missing
    40. 

  40.  // and compute the base values to use for the vandermonde matrix.
    41. 

  41. -bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
    42. 

  42. +template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
    43. 

  43.  {
    44. 

  44.    inputcount = (u32)present.size();
    45. 

  45.  
    46. 

  46. @@ -233,7 +233,7 @@
    47. 

  47.  
    48. 

  48.  // Record that the specified number of source files are all present
    49. 

  49.  // and compute the base values to use for the vandermonde matrix.
    50. 

  50. -bool ReedSolomon<Galois16>::SetInput(u32 count)
    51. 

  51. +template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
    52. 

  52.  {
    53. 

  53.    inputcount = count;
    54. 

  54.  
    55. 

  55. @@ -267,7 +267,7 @@
    56. 

  56.    return true;
    57. 

  57.  }
    58. 

  58.  
    59. 

  59. -bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
    60. 

  60. +template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
    61. 

  61.  {
    62. 

  62.    // Look up the appropriate element in the RS matrix
    63.