commit cdfb42d77a48f65c5a905b0d9b31309f59387822
author Tom Sepez <tsepez@chromium.org> Tue Aug 24 17:30:43 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 24 17:30:43 2021 +0000
tree 8dcd032c6691b915245bb7289efe03141e3bb642
parent 875651c42410a9e5b956f84336f5b67996769950

Remove fxbarcode/utils.h

The one enum it contains is better served in BC_Library.h which is
included almost everywhere.

Change-Id: I26a7a2bd946a8494d8625b10a41461f05aaa0323
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/84352
Reviewed-by: Hui Yingst <nigi@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fxbarcode/BC_Library.h

diff --git a/fxbarcode/BC_Library.h b/fxbarcode/BC_Library.h
index 5f1af4d..a4cabfd 100644
--- a/fxbarcode/BC_Library.h
+++ b/fxbarcode/BC_Library.h
@@ -38,6 +38,21 @@
   BC_LAST = BC_DATAMATRIX
 };
 
+enum BCFORMAT {
+  BCFORMAT_UNSPECIFY = -1,
+  BCFORMAT_CODABAR,
+  BCFORMAT_CODE_39,
+  BCFORMAT_CODE_128,
+  BCFORMAT_CODE_128B,
+  BCFORMAT_CODE_128C,
+  BCFORMAT_EAN_8,
+  BCFORMAT_UPC_A,
+  BCFORMAT_EAN_13,
+  BCFORMAT_PDF_417,
+  BCFORMAT_DATAMATRIX,
+  BCFORMAT_QR_CODE
+};
+
 void BC_Library_Init();
 void BC_Library_Destroy();
 

fxbarcode/BUILD.gn

diff --git a/fxbarcode/BUILD.gn b/fxbarcode/BUILD.gn
index af3eeaf..da05591 100644
--- a/fxbarcode/BUILD.gn
+++ b/fxbarcode/BUILD.gn
@@ -131,7 +131,6 @@
     "qrcode/BC_QRCoderMode.h",
     "qrcode/BC_QRCoderVersion.cpp",
     "qrcode/BC_QRCoderVersion.h",
-    "utils.h",
   ]
   deps = [
     "../core/fxcrt",

fxbarcode/cbc_eancode.h

diff --git a/fxbarcode/cbc_eancode.h b/fxbarcode/cbc_eancode.h
index 2a4608c..187b145 100644
--- a/fxbarcode/cbc_eancode.h
+++ b/fxbarcode/cbc_eancode.h
@@ -11,7 +11,6 @@
 
 #include "core/fxcrt/fx_string.h"
 #include "fxbarcode/cbc_onecode.h"
-#include "fxbarcode/utils.h"
 
 class CBC_OneDimEANWriter;
 

fxbarcode/cfx_barcode.cpp

diff --git a/fxbarcode/cfx_barcode.cpp b/fxbarcode/cfx_barcode.cpp
index 0b47134..bdb91b9 100644
--- a/fxbarcode/cfx_barcode.cpp
+++ b/fxbarcode/cfx_barcode.cpp
@@ -18,7 +18,6 @@
 #include "fxbarcode/cbc_pdf417i.h"
 #include "fxbarcode/cbc_qrcode.h"
 #include "fxbarcode/cbc_upca.h"
-#include "fxbarcode/utils.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {

fxbarcode/oned/BC_OneDimWriter.h

diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h
index d3039d3..4519055 100644
--- a/fxbarcode/oned/BC_OneDimWriter.h
+++ b/fxbarcode/oned/BC_OneDimWriter.h
@@ -17,7 +17,6 @@
 #include "core/fxge/cfx_textrenderoptions.h"
 #include "fxbarcode/BC_Library.h"
 #include "fxbarcode/BC_Writer.h"
-#include "fxbarcode/utils.h"
 
 class CFX_Font;
 class CFX_Matrix;

fxbarcode/utils.h

diff --git a/fxbarcode/utils.h b/fxbarcode/utils.h
deleted file mode 100644
index fe3caa6..0000000
--- a/fxbarcode/utils.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef FXBARCODE_UTILS_H_
-#define FXBARCODE_UTILS_H_
-
-enum BCFORMAT {
-  BCFORMAT_UNSPECIFY = -1,
-  BCFORMAT_CODABAR,
-  BCFORMAT_CODE_39,
-  BCFORMAT_CODE_128,
-  BCFORMAT_CODE_128B,
-  BCFORMAT_CODE_128C,
-  BCFORMAT_EAN_8,
-  BCFORMAT_UPC_A,
-  BCFORMAT_EAN_13,
-  BCFORMAT_PDF_417,
-  BCFORMAT_DATAMATRIX,
-  BCFORMAT_QR_CODE
-};
-
-#endif  // FXBARCODE_UTILS_H_